Use typed ToolBox::SetDeactivateHdl Link

Change-Id: Ia2521b000e962a0cc461a54f73b5c97bbe34a602

framework/inc/uielement/addonstoolbarmanager.hxx

@@ -63,7 +63,7 @@ class AddonsToolBarManager : public ToolBarManager
         DECL_LINK(Command, void *);
         DECL_LINK_TYPED(Select, ToolBox *, void);
         DECL_LINK_TYPED(Activate, ToolBox *, void);
-        DECL_LINK(Deactivate, void *);
+        DECL_LINK_TYPED(Deactivate, ToolBox *, void);
         DECL_LINK( StateChanged, StateChangedType* );
         DECL_LINK( DataChanged, DataChangedEvent* );
 

framework/inc/uielement/toolbarmanager.hxx

@@ -133,7 +133,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK_TYPED(DoubleClick, ToolBox *, void);
         DECL_LINK_TYPED(Select, ToolBox *, void);
         DECL_LINK_TYPED(Activate, ToolBox *, void);
-        DECL_LINK(Deactivate, void *);
+        DECL_LINK_TYPED(Deactivate, ToolBox *, void);
         DECL_LINK( StateChanged, StateChangedType* );
         DECL_LINK( DataChanged, DataChangedEvent* );
         DECL_LINK( MiscOptionsChanged, void* );

framework/source/uielement/addonstoolbarmanager.cxx

@@ -443,10 +443,8 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
 IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Activate, ToolBox *, void)
 {}
 
-IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate)
-{
-    return 1;
-}
+IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Deactivate, ToolBox *, void)
+{}
 
 IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
 {

framework/source/uielement/toolbarmanager.cxx

@@ -279,7 +279,7 @@ void ToolBarManager::Destroy()
     Link<> aEmpty;
     m_pToolBar->SetSelectHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetActivateHdl( Link<ToolBox *, void>() );
-    m_pToolBar->SetDeactivateHdl( aEmpty );
+    m_pToolBar->SetDeactivateHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDropdownClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() );
@@ -2029,10 +2029,8 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void)
 IMPL_LINK_NOARG_TYPED(ToolBarManager, Activate, ToolBox *, void)
 {}
 
-IMPL_LINK_NOARG(ToolBarManager, Deactivate)
-{
-    return 1;
-}
+IMPL_LINK_NOARG_TYPED(ToolBarManager, Deactivate, ToolBox *, void)
+{}
 
 IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
 {

include/sfx2/sidebar/SidebarToolBox.hxx

@@ -83,7 +83,7 @@ private:
     DECL_LINK_TYPED(DoubleClickHandler, ToolBox*, void);
     DECL_LINK_TYPED(SelectHandler, ToolBox*, void);
     DECL_LINK_TYPED(ActivateToolBox, ToolBox*, void);
-    DECL_LINK(DeactivateToolBox, ToolBox*);
+    DECL_LINK_TYPED(DeactivateToolBox, ToolBox*, void);
 
     void CreateController (
         const sal_uInt16 nItemId,

include/vcl/toolbox.hxx

@@ -188,7 +188,7 @@ private:
     Link<ToolBox *, void> maClickHdl;
     Link<ToolBox *, void> maDoubleClickHdl;
     Link<ToolBox *, void> maActivateHdl;
-    Link<>              maDeactivateHdl;
+    Link<ToolBox *, void> maDeactivateHdl;
     Link<>              maHighlightHdl;
     Link<ToolBox *, void> maSelectHdl;
     Link<>              maCommandHandler;
@@ -499,8 +499,7 @@ public:
     void                SetDoubleClickHdl( const Link<ToolBox *, void>& rLink ) { maDoubleClickHdl = rLink; }
     void                SetDropdownClickHdl( const Link<ToolBox *, void>& rLink );
     void                SetActivateHdl( const Link<ToolBox *, void>& rLink ) { maActivateHdl = rLink; }
-    void                SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
-    const Link<>&       GetDeactivateHdl() const { return maDeactivateHdl; }
+    void                SetDeactivateHdl( const Link<ToolBox *, void>& rLink ) { maDeactivateHdl = rLink; }
     void                SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; }
     const Link<>&       GetHighlightHdl() const { return maHighlightHdl; }
     void                SetSelectHdl( const Link<ToolBox *, void>& rLink ) { maSelectHdl = rLink; }

sfx2/source/sidebar/SidebarToolBox.cxx

@@ -80,7 +80,7 @@ void SidebarToolBox::dispose()
         SetDoubleClickHdl(Link<ToolBox *, void>());
         SetSelectHdl(Link<ToolBox *, void>());
         SetActivateHdl(Link<ToolBox *, void>());
-        SetDeactivateHdl(Link<>());
+        SetDeactivateHdl(Link<ToolBox *, void>());
         mbAreHandlersRegistered = false;
     }
 
@@ -276,10 +276,8 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void)
 IMPL_LINK_NOARG_TYPED(SidebarToolBox, ActivateToolBox, ToolBox*, void)
 {}
 
-IMPL_LINK(SidebarToolBox, DeactivateToolBox, ToolBox*, EMPTYARG)
-{
-    return 1;
-}
+IMPL_LINK_NOARG_TYPED(SidebarToolBox, DeactivateToolBox, ToolBox*, void)
+{}
 
 } } // end of namespace sfx2::sidebar