summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/ImpressViewShellBase.cxx
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-10-29 15:36:30 +0200
committerMathias Bauer <mba@openoffice.org>2010-10-29 15:36:30 +0200
commitcc04c581e296b02f84a3997834218b4477a09651 (patch)
tree1af6351c10b5e75ffc00e2e69b0a82b1d494312d /sd/source/ui/view/ImpressViewShellBase.cxx
parentf0b556722d70317842b9e297271e7165594dd2cc (diff)
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'sd/source/ui/view/ImpressViewShellBase.cxx')
-rwxr-xr-xsd/source/ui/view/ImpressViewShellBase.cxx10
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()