From f8b3fd8adfb0a009c41ea7b1a9f7ea0bd62cace2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- basctl/source/basicide/basidesh.cxx | 6 ------ 1 file changed, 6 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index ac19cfc9e479..0af7b9dda920 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -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 ); -- cgit