Use typed Menu::Set[De]actuivateHdl Links

Change-Id: I6736383ad0ec5c9f2ea2281bfdcfa280cd712032

6 files changed, 21 insertions, 21 deletions

diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 92dc2d6028cd..4c471a29f398 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -76,8 +76,8 @@ class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
 
     protected:
         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 );
 
     private:
         void UpdateSpecialFileMenu( Menu* pMenu );
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 23cd41d5a54a..b72d515be311 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -152,8 +152,8 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
 
     protected:
         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_TYPED( AsyncSettingsHdl, Timer *, void );
 
         void RemoveListener();
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 3acc8c6fe3f2..78fb5a03f0c6 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -140,7 +140,7 @@ class ToolBarManager : public ToolbarManager_Base
 
         DECL_LINK_TYPED( MenuButton, ToolBox *, void );
         DECL_LINK( MenuSelect, Menu * );
-        DECL_LINK( MenuDeactivate, Menu * );
+        DECL_LINK_TYPED( MenuDeactivate, Menu *, bool );
         DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void);
         DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* );
 
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 761d903e8ddf..e2e182700b9e 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -709,7 +709,7 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
 
 // vcl handler
 
-IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
+IMPL_LINK_TYPED( MenuManager, Activate, Menu *, pMenu, bool )
 {
     if ( pMenu == m_pVCLMenu )
     {
@@ -726,7 +726,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
         pMenu->SetMenuFlags( nFlag );
 
         if ( m_bActive )
-            return 0;
+            return false;
 
         m_bActive = true;
 
@@ -751,7 +751,7 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
         }
 
         if ( m_bInitialized )
-            return 0;
+            return false;
         else
         {
             URL aTargetURL;
@@ -806,15 +806,15 @@ IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
         }
     }
 
-    return 1;
+    return true;
 }
 
-IMPL_LINK( MenuManager, Deactivate, Menu *, pMenu )
+IMPL_LINK_TYPED( MenuManager, Deactivate, Menu *, pMenu, bool )
 {
     if ( pMenu == m_pVCLMenu )
         m_bActive = false;
 
-    return 1;
+    return true;
 }
 
 IMPL_LINK( MenuManager, Select, Menu *, pMenu )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 785080c29f83..7cb3b9046feb 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -723,7 +723,7 @@ private:
 
 }
 
-IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
+IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
 {
     if ( pMenu == m_pVCLMenu )
     {
@@ -747,7 +747,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         pMenu->SetMenuFlags( nFlag );
 
         if ( m_bActive )
-            return 0;
+            return false;
 
         m_bActive = true;
 
@@ -917,10 +917,10 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
         }
     }
 
-    return 1;
+    return true;
 }
 
-IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu )
+IMPL_LINK_TYPED( MenuBarManager, Deactivate, Menu *, pMenu, bool )
 {
     if ( pMenu == m_pVCLMenu )
     {
@@ -936,7 +936,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu )
         }
     }
 
-    return 1;
+    return true;
 }
 
 IMPL_LINK_NOARG_TYPED( MenuBarManager, AsyncSettingsHdl, Timer*, void)
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index d175b6edba44..0c0eb437d0d4 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1606,19 +1606,19 @@ void ToolBarManager::ImplClearPopupMenu( ToolBox *pToolBar )
     }
 }
 
-IMPL_LINK( ToolBarManager, MenuDeactivate, Menu*, pMenu )
+IMPL_LINK_TYPED( ToolBarManager, MenuDeactivate, Menu*, pMenu, bool )
 {
     SolarMutexGuard g;
 
     if ( m_bDisposed )
-        return 1;
+        return true;
 
     if( pMenu != m_pToolBar->GetMenu() )
-        return 1;
+        return true;
 
     ImplClearPopupMenu( m_pToolBar );
 
-    return 0;
+    return false;
 }
 
 Reference< XModel > ToolBarManager::GetModelFromFrame() const
@@ -1806,7 +1806,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
         {
             // Unlink our listeners again -- see above for why.
             pManagerMenu->SetSelectHdl( Link<>() );
-            pManagerMenu->SetDeactivateHdl( Link<>() );
+            pManagerMenu->SetDeactivateHdl( Link<Menu *, bool>() );
         }
     }
 }