diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:16:24 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-18 15:16:24 +0000 |
| commit | 27c53b596fab57c0e5af15b84ff01b6bef593e80 (patch) | |
| tree | 336266a2abe6a2e9354880c2c497a7b2efa7fdda /sfx2 | |
| parent | 75aac77996ad2fb5095fbd9b567faece92b86fd1 (diff) | |
INTEGRATION: CWS fwkbugfix04 (1.40.6); FILE MERGED
2004/12/10 08:27:02 mba 1.40.6.2: #i100000#: removed method found in assertion code
2004/12/06 18:01:30 mba 1.40.6.1: #i38334#: get rid of all code based on SfxConfigManager
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 40981a4233b3..c6eba5a3386d 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -2,9 +2,9 @@ * * $RCSfile: virtmenu.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: obo $ $Date: 2004-11-19 11:37:20 $ + * last change: $Author: kz $ $Date: 2005-01-18 16:16:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,15 +98,11 @@ #include "bindings.hxx" #include "dispatch.hxx" #include "app.hxx" -#include "accmgr.hxx" #include "sfxtypes.hxx" #include "arrdecl.hxx" #include "sfx.hrc" -//#include "ipfrm.hxx" -//#include "ipenv.hxx" #include "appdata.hxx" #include "viewsh.hxx" -#include "imgmgr.hxx" #include "sfxpicklist.hxx" #include "macrconf.hxx" #include "sfxresid.hxx" @@ -243,8 +239,8 @@ void SfxVirtualMenu::Construct_Impl() pSVMenu->SetSelectHdl( LINK(this, SfxVirtualMenu, Select) ); // #107258# accelerator keys are needed for accessibility - if ( bOLE ) - InvalidateKeyCodes(); + //if ( bOLE ) + // InvalidateKeyCodes(); if ( !pResMgr && pParent ) pResMgr = pParent->pResMgr; @@ -477,9 +473,6 @@ void SfxVirtualMenu::CreateFromSVMenu() if ( pPopup ) { - DBG_ASSERT( SfxMenuManager::IsPopupFunction(nId) || - !SFX_SLOTPOOL().GetIdPool().IsLocked(nId), - "popupmenu with existing func-id" ); SfxMenuControl *pMnuCtrl = SfxMenuControl::CreateControl(nId, *pPopup, *pBindings); @@ -1121,7 +1114,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) if ( bControllersUnBound ) BindControllers(); - InvalidateKeyCodes(); + //InvalidateKeyCodes(); pBindings->GetDispatcher_Impl()->Flush(); for ( USHORT nPos = 0; nPos < nCount; ++nPos ) { @@ -1335,7 +1328,7 @@ String SfxVirtualMenu::GetItemHelpText( USHORT nId ) const } //-------------------------------------------------------------------- - +/* void SfxVirtualMenu::InvalidateKeyCodes() { DBG_ASSERT( pSVMenu, "invalidating key of incomplete menu" ); @@ -1362,7 +1355,7 @@ void SfxVirtualMenu::InvalidateKeyCodes() pSVMenu->SetAccelKey( nId, aCode ); } } -} +} */ //-------------------------------------------------------------------- |