diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | f0b556722d70317842b9e297271e7165594dd2cc (patch) | |
| tree | f888dfa3ad24e6ea9a65bb44eb74dfdbd3064299 /sd/source/ui/view/PresentationViewShellBase.cxx | |
| parent | 8b52ada25a24b70b229b026f9f2928326d17443e (diff) | |
| parent | cc4fb231342cc7ad2f213a18c940248c436ee0e2 (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'sd/source/ui/view/PresentationViewShellBase.cxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/view/PresentationViewShellBase.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index 46be56156d85..4195f45cb5df 100644..100755 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -64,7 +64,11 @@ SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance ( void PresentationViewShellBase::RegisterFactory( USHORT nPrio ) { pFactory = new SfxViewFactory( +<<<<<<< local &CreateInstance,&InitFactory,nPrio); +======= + &CreateInstance,&InitFactory,nPrio,"FullScreenPresentation"); +>>>>>>> other InitFactory(); } void PresentationViewShellBase::InitFactory() |