diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-08-12 16:34:42 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-12 16:41:55 +0200 |
commit | f91d4f156b4fdb6e6a8a755714fd384bfa275e3d (patch) | |
tree | a41ef3630013ab19fc7ed63e610a5d7cfc5d0b2f /sfx2/source/menu | |
parent | 45fcdca7b32be49db75bfdcb027e33a04cb04f87 (diff) |
Unused pAutoDeactivate, is never non-null
...and was like that already in fd069bee7e57ad529c3c0974559fd2d84ec3151a
"initial import."
TODO: Menu::Highlight in vcl/source/window/menu.cxx makes it look like the now
almost empty IMPL_LINK_NOARG(SfxVirtualMenu,Highlight) returning sal_True makes
a difference compared to having no handler set (in which case aHighlightHdl.Call
returns 0), so I left it in; but that may just be overcautious and the handler
could really go for good.
Change-Id: I0cb28ddb1a5f747000b5749ed080502ae83c5575
Diffstat (limited to 'sfx2/source/menu')
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 005a140f10d9..d58fc65a510e 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -174,7 +174,6 @@ SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, pImageControl(0), pBindings(&rBindings), pResMgr(0), - pAutoDeactivate(0), nLocks(0), bHelpInitialized( bWithHelp ), bIsAddonPopupMenu( bIsAddonMenu ) @@ -208,7 +207,6 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp, pImageControl(0), pBindings(&rBindings), pResMgr(0), - pAutoDeactivate(0), nLocks(0), bHelpInitialized( bWithHelp ), bIsAddonPopupMenu( bIsAddonMenu ) @@ -252,14 +250,6 @@ SfxVirtualMenu::~SfxVirtualMenu() pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False; } - // QAP-Hack - if ( pAutoDeactivate ) - { - if ( pAutoDeactivate->IsActive() ) - Deactivate(0); - DELETEX(pAutoDeactivate); - } - if (pItems) { delete [] pItems; @@ -502,18 +492,10 @@ void SfxVirtualMenu::CreateFromSVMenu() // called on activation of the SV-Menu -IMPL_LINK( SfxVirtualMenu, Highlight, Menu *, pMenu ) +IMPL_LINK_NOARG( SfxVirtualMenu, Highlight ) { DBG_CHKTHIS(SfxVirtualMenu, 0); - // own StarView-Menu - if ( pMenu == pSVMenu ) - { - // AutoDeactivate is not necessary anymore - if ( pAutoDeactivate ) - pAutoDeactivate->Stop(); - } - return sal_True; } @@ -920,9 +902,6 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) // Supress the Status updates until Deactivate pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = sal_True; - if ( pAutoDeactivate ) // QAP-Hack - pAutoDeactivate->Start(); - return sal_True; } else @@ -945,9 +924,6 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu ) DBG_OUTF( ("SfxVirtualMenu %lx deactivated %lx, own %lx", this, pMenu, pSVMenu) ); if ( bIsActive && ( 0 == pMenu || pMenu == pSVMenu ) ) { - if ( pAutoDeactivate ) - pAutoDeactivate->Stop(); - // All controllers can be unbinded all the way up to the Menubar, // when the menu is disabled (= closed) if ( pParent ) |