Use typed Menu::SetHighlightHdl Link

Change-Id: I47a35813fddcb90497b621a96bafe74969dc90d0

cui/source/inc/numpages.hxx

@@ -329,7 +329,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
 
         DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
         DECL_LINK( LevelHdl_Impl, ListBox * );
-        DECL_LINK(PopupActivateHdl_Impl, void *);
+        DECL_LINK_TYPED(PopupActivateHdl_Impl, Menu *, bool);
         DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void );
         DECL_LINK(BulletHdl_Impl, void *);
         DECL_LINK( SizeHdl_Impl, MetricField * );

cui/source/tabpages/numpages.cxx

@@ -2036,7 +2036,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v
     }
 }
 
-IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PopupActivateHdl_Impl, Menu *, bool)
 {
     if(!bMenuButtonInitialized)
     {
@@ -2088,7 +2088,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl)
         }
         LeaveWait();
     }
-    return 0;
+    return false;
 }
 
 IMPL_LINK_NOARG(SvxNumOptionsTabPage, BulletHdl_Impl)

framework/inc/classes/menumanager.hxx

@@ -75,7 +75,7 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
         );
 
     protected:
-        DECL_LINK(Highlight, void *);
+        DECL_LINK_TYPED(Highlight, Menu *, bool);
         DECL_LINK( Activate, Menu * );
         DECL_LINK( Deactivate, Menu * );
 

framework/inc/uielement/menubarmanager.hxx

@@ -151,7 +151,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         void GetPopupController( PopupControllerCache& rPopupController );
 
     protected:
-        DECL_LINK(Highlight, void *);
+        DECL_LINK_TYPED(Highlight, Menu *, bool);
         DECL_LINK( Activate, Menu * );
         DECL_LINK( Deactivate, Menu * );
         DECL_LINK_TYPED( AsyncSettingsHdl, Timer *, void );

framework/source/classes/menumanager.cxx

@@ -890,9 +890,9 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
     return 1;
 }
 
-IMPL_LINK_NOARG(MenuManager, Highlight)
+IMPL_LINK_NOARG_TYPED(MenuManager, Highlight, Menu *, bool)
 {
-    return 0;
+    return false;
 }
 
 void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,bool _bDelete,bool _bDeleteChildren)

framework/source/uielement/menubarmanager.cxx

@@ -1023,9 +1023,9 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
     return 1;
 }
 
-IMPL_LINK_NOARG(MenuBarManager, Highlight)
+IMPL_LINK_NOARG_TYPED(MenuBarManager, Highlight, Menu *, bool)
 {
-    return 0;
+    return false;
 }
 
 bool MenuBarManager::MustBeHidden( PopupMenu* pPopupMenu, const Reference< XURLTransformer >& rTransformer )

include/vcl/menu.hxx

@@ -128,7 +128,7 @@ private:
 
     Link<>              aActivateHdl;       // Active-Handler
     Link<>              aDeactivateHdl;     // Deactivate-Handler
-    Link<>              aHighlightHdl;      // Highlight-Handler
+    Link<Menu *, bool>  aHighlightHdl;      // Highlight-Handler
     Link<>              aSelectHdl;         // Highlight-Handler
 
     VclEventListeners   maEventListeners;
@@ -326,8 +326,7 @@ public:
     void                SetDeactivateHdl( const Link<>& rLink ) { aDeactivateHdl = rLink; }
     const Link<>&       GetDeactivateHdl() const                { return aDeactivateHdl; }
 
-    void                SetHighlightHdl( const Link<>& rLink )  { aHighlightHdl = rLink; }
-    const Link<>&       GetHighlightHdl() const                 { return aHighlightHdl; }
+    void                SetHighlightHdl( const Link<Menu *, bool>& rLink )  { aHighlightHdl = rLink; }
 
     void                SetSelectHdl( const Link<>& rLink )     { aSelectHdl = rLink; }
     const Link<>&       GetSelectHdl() const                    { return aSelectHdl; }

sfx2/source/inc/virtmenu.hxx

@@ -69,7 +69,7 @@ protected:
                         SfxBindings &rBind, bool bOLEServer=false, bool bRes=false, bool bIsAddonMenu=false );
 
     void            CreateFromSVMenu();
-    DECL_LINK( Highlight, void * );
+    DECL_LINK_TYPED( Highlight, Menu *, bool );
     DECL_LINK( Activate, Menu * );
     DECL_LINK( Deactivate, Menu * );
     DECL_LINK( SettingsChanged, void* );

sfx2/source/menu/virtmenu.cxx

@@ -483,10 +483,10 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
 // called on activation of the SV-Menu
 
-IMPL_LINK_NOARG( SfxVirtualMenu, Highlight )
+IMPL_LINK_NOARG_TYPED( SfxVirtualMenu, Highlight, Menu *, bool )
 {
 
-    return sal_True;
+    return true;
 }
 
 IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged)