strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS gnumake2: resolve conflicts and make sources buildable on Linux

Browse source
This commit is contained in:
Mathias Bauer 2010-10-29 15:36:30 +02:00
parent c93f01621f
commit f8b3fd8adf
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
basctl/source/basicide/basidesh.cxx
View file

@ -155,18 +155,12 @@ public:
TYPEINIT1( BasicIDEShell, SfxViewShell );
<<<<<<< local
SFX_IMPL_VIEWFACTORY( BasicIDEShell )
=======
SFX_IMPL_NAMED_VIEWFACTORY( BasicIDEShell, "Default" )
>>>>>>> other
{
SFX_VIEW_REGISTRATION( BasicDocShell );
}
// MI: Prinzipiel IDL, aber ich lieber doch nicht?
// SFX_IMPL_ /*IDL_*/ INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
SFX_IMPL_INTERFACE( BasicIDEShell, SfxViewShell, IDEResId( RID_STR_IDENAME ) )
{
SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );