Use typed ToolBox::SetStateChangedHdl Link

Change-Id: I9b574f652e5d999086e32e9c7ede7c68fe5cc99a

4 files changed, 7 insertions, 10 deletions

diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 234df21ae560..0d31d8200f9c 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -64,7 +64,7 @@ class AddonsToolBarManager : public ToolBarManager
         DECL_LINK_TYPED(Select, ToolBox *, void);
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
-        DECL_LINK( StateChanged, StateChangedType* );
+        DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
         DECL_LINK( DataChanged, DataChangedEvent* );
 
         virtual bool MenuItemAllowed( sal_uInt16 ) const SAL_OVERRIDE;
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 0bc40ca1d7ab..810076da34fa 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -134,7 +134,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK_TYPED(Select, ToolBox *, void);
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
-        DECL_LINK( StateChanged, StateChangedType* );
+        DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
         DECL_LINK( DataChanged, DataChangedEvent* );
         DECL_LINK( MiscOptionsChanged, void* );
 
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index b8a9bf8ece78..3b92f45fe21d 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -439,13 +439,12 @@ IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Activate, ToolBox *, void)
 IMPL_LINK_NOARG_TYPED(AddonsToolBarManager, Deactivate, ToolBox *, void)
 {}
 
-IMPL_LINK( AddonsToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
+IMPL_LINK_TYPED( AddonsToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
 {
     if ( *pStateChangedType == StateChangedType::ControlBackground )
     {
         CheckAndUpdateImages();
     }
-    return 1;
 }
 
 IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index aa163b976799..ccf886b2c7aa 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -276,15 +276,14 @@ void ToolBarManager::Destroy()
         // #i93173# delete toolbar lazily as we can still be in one of its handlers
     m_pToolBar->doLazyDelete();
 
-    Link<> aEmpty;
     m_pToolBar->SetSelectHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetActivateHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDeactivateHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDropdownClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() );
-    m_pToolBar->SetStateChangedHdl( aEmpty );
-    m_pToolBar->SetDataChangedHdl( aEmpty );
+    m_pToolBar->SetStateChangedHdl( Link<StateChangedType const *, void>() );
+    m_pToolBar->SetDataChangedHdl( Link<>() );
     m_pToolBar->SetCommandHdl( Link<CommandEvent const *, void>() );
 
     m_pToolBar.clear();
@@ -2030,10 +2029,10 @@ IMPL_LINK_NOARG_TYPED(ToolBarManager, Activate, ToolBox *, void)
 IMPL_LINK_NOARG_TYPED(ToolBarManager, Deactivate, ToolBox *, void)
 {}
 
-IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
+IMPL_LINK_TYPED( ToolBarManager, StateChanged, StateChangedType const *, pStateChangedType, void )
 {
     if ( m_bDisposed )
-        return 1;
+        return;
 
     if ( *pStateChangedType == StateChangedType::ControlBackground )
     {
@@ -2050,7 +2049,6 @@ IMPL_LINK( ToolBarManager, StateChanged, StateChangedType*, pStateChangedType )
     {
         m_aAsyncUpdateControllersTimer.Start();
     }
-    return 1;
 }
 
 IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )