Use typed ToolBox::SetActivateHdl Link

Change-Id: I15044bd9ea94562c1d4727f64aa0b32543e0cc0a

framework/inc/uielement/addonstoolbarmanager.hxx

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

framework/inc/uielement/toolbarmanager.hxx

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

framework/source/uielement/addonstoolbarmanager.cxx

@@ -440,10 +440,8 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Select, ToolBox *, void)
     }
 }
 
-IMPL_LINK_NOARG(AddonsToolBarManager, Activate)
-{
-    return 1;
-}
+IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Activate, ToolBox *, void)
+{}
 
 IMPL_LINK_NOARG(AddonsToolBarManager, Deactivate)
 {

framework/source/uielement/toolbarmanager.cxx

@@ -278,7 +278,7 @@ void ToolBarManager::Destroy()
 
     Link<> aEmpty;
     m_pToolBar->SetSelectHdl( Link<ToolBox *, void>() );
-    m_pToolBar->SetActivateHdl( aEmpty );
+    m_pToolBar->SetActivateHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDeactivateHdl( aEmpty );
     m_pToolBar->SetClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDropdownClickHdl( Link<ToolBox *, void>() );
@@ -2026,10 +2026,8 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void)
     }
 }
 
-IMPL_LINK_NOARG(ToolBarManager, Activate)
-{
-    return 1;
-}
+IMPL_LINK_NOARG_TYPED(ToolBarManager, Activate, ToolBox *, void)
+{}
 
 IMPL_LINK_NOARG(ToolBarManager, Deactivate)
 {

include/sfx2/sidebar/SidebarToolBox.hxx

@@ -82,7 +82,7 @@ private:
     DECL_LINK_TYPED(ClickHandler, ToolBox*, void);
     DECL_LINK_TYPED(DoubleClickHandler, ToolBox*, void);
     DECL_LINK_TYPED(SelectHandler, ToolBox*, void);
-    DECL_LINK(ActivateToolBox, ToolBox*);
+    DECL_LINK_TYPED(ActivateToolBox, ToolBox*, void);
     DECL_LINK(DeactivateToolBox, ToolBox*);
 
     void CreateController (

include/vcl/toolbox.hxx

@@ -187,7 +187,7 @@ private:
     ToolBoxLayoutMode   meLayoutMode;
     Link<ToolBox *, void> maClickHdl;
     Link<ToolBox *, void> maDoubleClickHdl;
-    Link<>              maActivateHdl;
+    Link<ToolBox *, void> maActivateHdl;
     Link<>              maDeactivateHdl;
     Link<>              maHighlightHdl;
     Link<ToolBox *, void> maSelectHdl;
@@ -498,8 +498,7 @@ public:
     void                SetClickHdl( const Link<ToolBox *, void>& rLink ) { maClickHdl = rLink; }
     void                SetDoubleClickHdl( const Link<ToolBox *, void>& rLink ) { maDoubleClickHdl = rLink; }
     void                SetDropdownClickHdl( const Link<ToolBox *, void>& rLink );
-    void                SetActivateHdl( const Link<>& rLink ) { maActivateHdl = rLink; }
-    const Link<>&       GetActivateHdl() const { return maActivateHdl; }
+    void                SetActivateHdl( const Link<ToolBox *, void>& rLink ) { maActivateHdl = rLink; }
     void                SetDeactivateHdl( const Link<>& rLink ) { maDeactivateHdl = rLink; }
     const Link<>&       GetDeactivateHdl() const { return maDeactivateHdl; }
     void                SetHighlightHdl( const Link<>& rLink ) { maHighlightHdl = rLink; }

sfx2/source/sidebar/SidebarToolBox.cxx

@@ -79,7 +79,7 @@ void SidebarToolBox::dispose()
         SetClickHdl(Link<ToolBox *, void>());
         SetDoubleClickHdl(Link<ToolBox *, void>());
         SetSelectHdl(Link<ToolBox *, void>());
-        SetActivateHdl(Link<>());
+        SetActivateHdl(Link<ToolBox *, void>());
         SetDeactivateHdl(Link<>());
         mbAreHandlersRegistered = false;
     }
@@ -273,10 +273,8 @@ IMPL_LINK_TYPED(SidebarToolBox, SelectHandler, ToolBox*, pToolBox, void)
         xController->execute((sal_Int16)pToolBox->GetModifier());
 }
 
-IMPL_LINK(SidebarToolBox, ActivateToolBox, ToolBox*, EMPTYARG)
-{
-    return 1;
-}
+IMPL_LINK_NOARG_TYPED(SidebarToolBox, ActivateToolBox, ToolBox*, void)
+{}
 
 IMPL_LINK(SidebarToolBox, DeactivateToolBox, ToolBox*, EMPTYARG)
 {