Use typed ToolBox::SetCommandHdl Link

Change-Id: Ieee142ddebb288037647fb77bac6f11b9827c4a8

4 files changed, 8 insertions, 17 deletions

diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 542a366f48dc..234df21ae560 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -60,7 +60,7 @@ class AddonsToolBarManager : public ToolBarManager
     protected:
         DECL_LINK_TYPED(Click, ToolBox *, void);
         DECL_LINK_TYPED(DoubleClick, ToolBox *, void);
-        DECL_LINK(Command, void *);
+        DECL_LINK_TYPED(Command, CommandEvent const *, void);
         DECL_LINK_TYPED(Select, ToolBox *, void);
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 7e1ae3b7c8aa..0bc40ca1d7ab 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -126,7 +126,7 @@ class ToolBarManager : public ToolbarManager_Base
         typedef std::vector< ControllerParams > ControllerParamsVector;
 
     protected:
-        DECL_LINK( Command, CommandEvent * );
+        DECL_LINK_TYPED( Command, CommandEvent const *, void );
         PopupMenu * GetToolBarCustomMenu(ToolBox* pToolBar);
         DECL_LINK_TYPED(Click, ToolBox *, void);
         DECL_LINK_TYPED(DropdownClick, ToolBox *, void);
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index ca56c441624a..b8a9bf8ece78 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -413,15 +413,8 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, DoubleClick, ToolBox *, void)
     }
 }
 
-IMPL_LINK_NOARG(AddonsToolBarManager, Command)
-{
-    SolarMutexGuard g;
-
-    if ( m_bDisposed )
-        return 1;
-
-    return 0;
-}
+IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Command, CommandEvent const *, void)
+{}
 
 IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
 {
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ca2c94356642..aa163b976799 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -285,7 +285,7 @@ void ToolBarManager::Destroy()
     m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetStateChangedHdl( aEmpty );
     m_pToolBar->SetDataChangedHdl( aEmpty );
-    m_pToolBar->SetCommandHdl( aEmpty );
+    m_pToolBar->SetCommandHdl( Link<CommandEvent const *, void>() );
 
     m_pToolBar.clear();
 
@@ -1772,14 +1772,14 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
     return pMenu;
 }
 
-IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt )
+IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void )
 {
     SolarMutexGuard g;
 
     if ( m_bDisposed )
-        return 1;
+        return;
     if ( pCmdEvt->GetCommand() != COMMAND_CONTEXTMENU )
-        return 0;
+        return;
 
     ::PopupMenu * pMenu = GetToolBarCustomMenu(m_pToolBar);
     if (pMenu)
@@ -1810,8 +1810,6 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*, pCmdEvt )
             pManagerMenu->SetDeactivateHdl( Link<>() );
         }
     }
-
-    return 0;
 }
 
 IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar )