summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/ImpressViewShellBase.cxx
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-10-28 23:02:10 +0200
committerMathias Bauer <mba@openoffice.org>2010-10-28 23:02:10 +0200
commitf0b556722d70317842b9e297271e7165594dd2cc (patch)
treef888dfa3ad24e6ea9a65bb44eb74dfdbd3064299 /sd/source/ui/view/ImpressViewShellBase.cxx
parent8b52ada25a24b70b229b026f9f2928326d17443e (diff)
parentcc4fb231342cc7ad2f213a18c940248c436ee0e2 (diff)
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'sd/source/ui/view/ImpressViewShellBase.cxx')
-rwxr-xr-x[-rw-r--r--]sd/source/ui/view/ImpressViewShellBase.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 0f62dea701e4..c7318c413231 100644..100755
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -62,7 +62,11 @@ 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()