Use typed Menu::Set[De]actuivateHdl Links

Change-Id: I6736383ad0ec5c9f2ea2281bfdcfa280cd712032

3 files changed, 11 insertions, 11 deletions

diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 0bf8dc7a12e6..48b5064e395b 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -70,8 +70,8 @@ protected:
 
     void            CreateFromSVMenu();
     DECL_LINK_TYPED( Highlight, Menu *, bool );
-    DECL_LINK( Activate, Menu * );
-    DECL_LINK( Deactivate, Menu * );
+    DECL_LINK_TYPED( Activate, Menu *, bool );
+    DECL_LINK_TYPED( Deactivate, Menu *, bool );
     DECL_LINK( SettingsChanged, void* );
 
     // Used for runtime popup menus
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 61cf0048daf1..0866ef8993e6 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -326,7 +326,7 @@ SfxAppMenuControl_Impl::~SfxAppMenuControl_Impl()
     delete pMenu;
 }
 
-IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
+IMPL_LINK_TYPED( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu, bool )
 {
     if ( pActMenu )
     {
@@ -382,10 +382,10 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
             }
         }
 
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 SfxUnoMenuControl* SfxMenuControl::CreateControl( const OUString& rCmd,
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index dd0682ac714f..36ff55a9fde3 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -775,7 +775,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
 
 // called on activation of the SV-Menu
 
-IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
+IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool )
 {
     SAL_INFO(
         "sfx",
@@ -801,7 +801,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
     {
         // Prevent Double Activate
         if ( bIsActive )
-            return sal_True;
+            return true;
 
         // ggf. Pick-Menu erzeugen
         if ( pParent && pSVMenu == pParent->pPickMenu )
@@ -894,7 +894,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         // Suppress the Status updates until Deactivate
         pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = true;
 
-        return sal_True;
+        return true;
     }
     else
     {
@@ -905,13 +905,13 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         if ( !bRet)
             DBG_WARNING( "W1: Virtual menu could not be created!" );
 #endif
-        return long(bRet);
+        return bRet;
     }
 }
 
 
 
-IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
+IMPL_LINK_TYPED( SfxVirtualMenu, Deactivate, Menu *, pMenu, bool )
 {
     SAL_INFO(
         "sfx",
@@ -925,7 +925,7 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
             UnbindControllers();
         pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = false;
     }
-    return sal_True;
+    return true;
 }