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 | cc04c581e296b02f84a3997834218b4477a09651 (patch) | |
| tree | 1af6351c10b5e75ffc00e2e69b0a82b1d494312d /sd/source/ui/view/GraphicViewShellBase.cxx | |
| parent | f0b556722d70317842b9e297271e7165594dd2cc (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sd/source/ui/view/GraphicViewShellBase.cxx')
| -rwxr-xr-x | sd/source/ui/view/GraphicViewShellBase.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 8845a6b125ad..e63ce8d62fa1 100755 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -45,12 +45,6 @@ TYPEINIT1(GraphicViewShellBase, ViewShellBase); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new GraphicViewShellBase object has been constructed. -/* -SFX_IMPL_VIEWFACTORY(GraphicViewShellBase, SdResId(STR_DEFAULTVIEW)) -{ - SFX_VIEW_REGISTRATION(GraphicDocShell); -} -*/ SfxViewFactory* GraphicViewShellBase::pFactory; SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance ( SfxViewFrame *pFrame, SfxViewShell *pOldView) @@ -62,11 +56,7 @@ SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance ( void GraphicViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( -<<<<<<< local - &CreateInstance,&InitFactory,nPrio); -======= &CreateInstance,&InitFactory,nPrio,"Default"); ->>>>>>> other InitFactory(); } void GraphicViewShellBase::InitFactory() |