diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:20:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:20:50 +0000 |
| commit | 04bd6ed35dda802d5896467892334f1d565e3ace (patch) | |
| tree | 4d2e596b588f622cd3180c48c5ac1d32f0b5811b | |
| parent | 3e57eec321fc217c81dcd48b8f25ca66d5be2fea (diff) | |
INTEGRATION: CWS fwkbugfix04 (1.47.6); FILE MERGED
2005/01/06 17:45:04 mba 1.47.6.2: RESYNC: (1.47-1.48); FILE MERGED
2004/12/06 18:04:25 mba 1.47.6.1: #i38334#: get rid of all code based on SfxConfigManager
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 1e2702442caa..ebfd6e4ed69b 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewsh.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: rt $ $Date: 2005-01-11 13:34:24 $ + * last change: $Author: kz $ $Date: 2005-01-18 16:20:50 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -121,12 +121,9 @@ #include "docfile.hxx" #include "dispatch.hxx" #include "arrdecl.hxx" -#include "accmgr.hxx" #include "intfrm.hxx" #include "docfac.hxx" #include "view.hrc" -#include "mnumgr.hxx" -#include "virtmenu.hxx" #include "objuno.hxx" #include "sfxlocal.hrc" #include "sfxbasecontroller.hxx" @@ -1485,7 +1482,6 @@ void SfxViewShell::ReleaseMenuBar_Impl() SfxMenuBarManager* SfxViewShell::GetMenuBar_Impl( BOOL bPlugin ) { // get the accelerators - GetAccMgr_Impl(); Reference < XPropertySet > xPropSet( GetViewFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY ); if ( xPropSet.is() ) @@ -1510,16 +1506,6 @@ SfxMenuBarManager* SfxViewShell::GetMenuBar_Impl( BOOL bPlugin ) return NULL; } -SfxAcceleratorManager* SfxViewShell::GetAccMgr_Impl() -{ - // all views of a document share the accelerators -#if SUPD>633 - return GetObjectShell()->GetAccMgr_Impl(); -#else - return GetObjectShell()->GetFactory().GetAccMgr_Impl(); -#endif -} - void SfxViewShell::SetController( SfxBaseController* pController ) { pImp->pController = pController; |