diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
| commit | f8b3fd8adfb0a009c41ea7b1a9f7ea0bd62cace2 (patch) | |
| tree | e7fc2ad8edb9946214927c9eaee8bc0aa611805f /basctl | |
| parent | c93f01621fa781108cf70e9a80d4c350dc7902c1 (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
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 ); |