convert Link<> to typed

Change-Id: I38f2c15b4f8bb1d7187b019d26a2644b087898c1
Reviewed-on: https://gerrit.libreoffice.org/18357
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

8 files changed, 14 insertions, 14 deletions

diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index ea97658ec1a0..44e4a7895f80 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -61,7 +61,7 @@ class MenuManager : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
         // XEventListener
         virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 
-        DECL_LINK( Select, Menu * );
+        DECL_LINK_TYPED( Select, Menu *, bool );
 
         Menu*   GetMenu() const { return m_pVCLMenu; }
 
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index d62aaae7defc..ac4b9d43c086 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -126,7 +126,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
         // XSystemDependentMenuPeer
         virtual ::com::sun::star::uno::Any SAL_CALL getMenuHandle( const ::com::sun::star::uno::Sequence< sal_Int8 >& ProcessId, sal_Int16 SystemType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 
-        DECL_LINK( Select, Menu * );
+        DECL_LINK_TYPED( Select, Menu *, bool );
 
         Menu*   GetMenuBar() const { return m_pVCLMenu; }
 
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index 19da55594006..f5366b02a43d 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -63,7 +63,7 @@ class ToggleButtonToolbarController : public ComplexToolbarController
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getExecuteArgs(sal_Int16 KeyModifier) const SAL_OVERRIDE;
 
     private:
-        DECL_LINK( MenuSelectHdl, Menu *);
+        DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool);
 
         Style                        m_eStyle;
         OUString                m_aCurrentSelection;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 5cf00f7290fe..f4431778c95c 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -137,7 +137,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK( MiscOptionsChanged, void* );
 
         DECL_LINK_TYPED( MenuButton, ToolBox *, void );
-        DECL_LINK( MenuSelect, Menu * );
+        DECL_LINK_TYPED( MenuSelect, Menu *, bool );
         DECL_LINK_TYPED( MenuDeactivate, Menu *, bool );
         DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void);
         DECL_STATIC_LINK_TYPED( ToolBarManager, ExecuteHdl_Impl, void*, void );
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 039871da550d..5e72a344222d 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -813,7 +813,7 @@ IMPL_LINK_TYPED( MenuManager, Deactivate, Menu *, pMenu, bool )
     return true;
 }
 
-IMPL_LINK( MenuManager, Select, Menu *, pMenu )
+IMPL_LINK_TYPED( MenuManager, Select, Menu *, pMenu, bool )
 {
     URL                     aTargetURL;
     Sequence<PropertyValue> aArgs;
@@ -883,7 +883,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu )
     if ( xDispatch.is() )
         xDispatch->dispatch( aTargetURL, aArgs );
 
-    return 1;
+    return true;
 }
 
 IMPL_LINK_NOARG_TYPED(MenuManager, Highlight, Menu *, bool)
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 0d951c08fefa..3a3c5124cd2e 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -954,7 +954,7 @@ IMPL_LINK_NOARG_TYPED( MenuBarManager, AsyncSettingsHdl, Timer*, void)
     }
 }
 
-IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
+IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu, bool )
 {
     URL                     aTargetURL;
     Sequence<PropertyValue> aArgs;
@@ -1021,7 +1021,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu )
         xDispatch->dispatch( aTargetURL, aArgs );
     }
 
-    return 1;
+    return true;
 }
 
 IMPL_LINK_NOARG_TYPED(MenuBarManager, Highlight, Menu *, bool)
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 48f9e1ccc8ef..0ea0cbf90375 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -263,7 +263,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta
     }
 }
 
-IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu )
+IMPL_LINK_TYPED( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu, bool )
 {
     SolarMutexGuard aGuard;
 
@@ -274,7 +274,7 @@ IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu )
 
         execute( 0 );
     }
-    return 0;
+    return false;
 }
 
 } // namespace
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 2224e5cbcf3c..f19c611c2e50 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1831,7 +1831,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
         if (pManagerMenu)
         {
             // Unlink our listeners again -- see above for why.
-            pManagerMenu->SetSelectHdl( Link<>() );
+            pManagerMenu->SetSelectHdl( Link<Menu*, bool>() );
             pManagerMenu->SetDeactivateHdl( Link<Menu *, bool>() );
         }
     }
@@ -1849,7 +1849,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuButton, ToolBox*, pToolBar, void )
     ImplClearPopupMenu( pToolBar );
  }
 
-IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
+IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool )
 {
     // We have to hold a reference to ourself as it is possible that we will be disposed and
     // our refcount could be zero (destruction) otherwise.
@@ -1861,7 +1861,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
         SolarMutexGuard g;
 
         if ( m_bDisposed )
-            return 1;
+            return true;
 
         switch ( pMenu->GetCurItemId() )
         {
@@ -2026,7 +2026,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu )
         ImplClearPopupMenu( m_pToolBar );
     }
 
-    return 1;
+    return true;
 }
 
 IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void)