diff options
Diffstat (limited to 'sd/source/ui/view/ImpressViewShellBase.cxx')
| -rwxr-xr-x | sd/source/ui/view/ImpressViewShellBase.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index c7318c413231..17815dcc9554 100755 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -45,12 +45,6 @@ TYPEINIT1(ImpressViewShellBase, ViewShellBase); // We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a // new ImpressViewShellBase object has been constructed. -/* -SFX_IMPL_VIEWFACTORY(ImpressViewShellBase, SdResId(STR_DEFAULTVIEW)) -{ - SFX_VIEW_REGISTRATION(DrawDocShell); -} -*/ SfxViewFactory* ImpressViewShellBase::pFactory; SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance ( SfxViewFrame *pFrame, SfxViewShell *pOldView) @@ -62,11 +56,7 @@ SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance ( void ImpressViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( -<<<<<<< local - &CreateInstance,&InitFactory,nPrio); -======= &CreateInstance,&InitFactory,nPrio,"Default"); ->>>>>>> other InitFactory(); } void ImpressViewShellBase::InitFactory() |