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

2 files changed, 2 insertions, 28 deletions

diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 10e971d1472a..0bf4152d7927 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -24,7 +24,6 @@
 #include <sfx2/mnuitem.hxx>
 
 class SfxBindings;
-class Timer;
 class SfxMenuImageControl_Impl;
 
 typedef ::boost::ptr_vector<SfxMenuControl> SfxMenuCtrlArr_Impl;
@@ -44,7 +43,6 @@ private:
     PopupMenu*      pWindowMenu;
     PopupMenu*      pPickMenu;
     PopupMenu*      pAddonsMenu;
-    Timer*          pAutoDeactivate; // Hack for QAP-Bug
     sal_uInt16          nVisibleItems;
     sal_uInt16          nId;
     sal_uInt16          nCount;
@@ -71,7 +69,7 @@ protected:
                         SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False );
 
     void            CreateFromSVMenu();
-    DECL_LINK( Highlight, Menu * );
+    DECL_LINK( Highlight, void * );
     DECL_LINK( Activate, Menu * );
     DECL_LINK( Deactivate, Menu * );
     DECL_LINK( SettingsChanged, void* );
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 )