6 files changed, 11 insertions, 21 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 )
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index d2a09ced76aa..cbf6342dc7d2 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -190,7 +190,7 @@ private:
     Link<ToolBox *, void> maActivateHdl;
     Link<ToolBox *, void> maDeactivateHdl;
     Link<ToolBox *, void> maSelectHdl;
-    Link<>              maCommandHandler;
+    Link<CommandEvent const *, void> maCommandHandler;
     Link<>              maStateChangedHandler;
     Link<>              maDataChangedHandler;
 
@@ -504,8 +504,7 @@ public:
     void                SetDeactivateHdl( const Link<ToolBox *, void>& rLink ) { maDeactivateHdl = rLink; }
     void                SetSelectHdl( const Link<ToolBox *, void>& rLink ) { maSelectHdl = rLink; }
     const Link<ToolBox *, void>& GetSelectHdl() const { return maSelectHdl; }
-    void                SetCommandHdl( const Link<>& aLink ) { maCommandHandler = aLink; }
-    const Link<>&       GetCommandHdl() const { return maCommandHandler; }
+    void                SetCommandHdl( const Link<CommandEvent const *, void>& aLink ) { maCommandHandler = aLink; }
     void                SetStateChangedHdl( const Link<>& aLink ) { maStateChangedHandler = aLink; }
     const Link<>&       GetStateChangedHdl() const { return maStateChangedHandler; }
     void                SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; }
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index adc41ecfb9e1..3e7d7e86fb6b 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4357,7 +4357,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
 void ToolBox::Command( const CommandEvent& rCEvt )
 {
     if ( maCommandHandler.IsSet() )
-        maCommandHandler.Call( (void *)( &rCEvt ));
+        maCommandHandler.Call( &rCEvt );
 
     // depict StartDrag on MouseButton/Left/Alt
     if ( (rCEvt.GetCommand() == COMMAND_STARTDRAG) && rCEvt.IsMouseEvent() &&