6 files changed, 8 insertions, 13 deletions
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 0d31d8200f9c..f01093fa02e8 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -65,7 +65,7 @@ class AddonsToolBarManager : public ToolBarManager
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
         DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
-        DECL_LINK( DataChanged, DataChangedEvent* );
+        DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
 
         virtual bool MenuItemAllowed( sal_uInt16 ) const SAL_OVERRIDE;
 };
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 810076da34fa..f8e89326beaa 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -135,7 +135,7 @@ class ToolBarManager : public ToolbarManager_Base
         DECL_LINK_TYPED(Activate, ToolBox *, void);
         DECL_LINK_TYPED(Deactivate, ToolBox *, void);
         DECL_LINK_TYPED( StateChanged, StateChangedType const *, void );
-        DECL_LINK( DataChanged, DataChangedEvent* );
+        DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void );
         DECL_LINK( MiscOptionsChanged, void* );
 
         DECL_LINK( MenuButton, ToolBox * );
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 3b92f45fe21d..f89563055c2d 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -447,7 +447,7 @@ IMPL_LINK_TYPED( AddonsToolBarManager, StateChanged, StateChangedType const *, p
     }
 }
 
-IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
+IMPL_LINK_TYPED( AddonsToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEvent, void )
 {
     if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS )   ||
         (  pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY  ))  &&
@@ -466,8 +466,6 @@ IMPL_LINK( AddonsToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEve
             pWindow->DataChanged( rDCEvt );
         }
     }
-
-    return 1;
 }
 
 }
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index ccf886b2c7aa..52d3081f223c 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -283,7 +283,7 @@ void ToolBarManager::Destroy()
     m_pToolBar->SetDropdownClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetDoubleClickHdl( Link<ToolBox *, void>() );
     m_pToolBar->SetStateChangedHdl( Link<StateChangedType const *, void>() );
-    m_pToolBar->SetDataChangedHdl( Link<>() );
+    m_pToolBar->SetDataChangedHdl( Link<DataChangedEvent const *, void>() );
     m_pToolBar->SetCommandHdl( Link<CommandEvent const *, void>() );
 
     m_pToolBar.clear();
@@ -2051,7 +2051,7 @@ IMPL_LINK_TYPED( ToolBarManager, StateChanged, StateChangedType const *, pStateC
     }
 }
 
-IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
+IMPL_LINK_TYPED( ToolBarManager, DataChanged, DataChangedEvent const *, pDataChangedEvent, void )
 {
     if ((( pDataChangedEvent->GetType() == DataChangedEventType::SETTINGS )   ||
         (  pDataChangedEvent->GetType() == DataChangedEventType::DISPLAY  ))  &&
@@ -2079,8 +2079,6 @@ IMPL_LINK( ToolBarManager, DataChanged, DataChangedEvent*, pDataChangedEvent  )
         ::Size aSize( m_pToolBar->CalcWindowSizePixel() );
         m_pToolBar->SetOutputSizePixel( aSize );
     }
-
-    return 1;
 }
 
 IMPL_LINK_NOARG(ToolBarManager, MiscOptionsChanged)
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx
index bd72a7bdfd9a..ad3e7ccc6339 100644
--- a/include/vcl/toolbox.hxx
+++ b/include/vcl/toolbox.hxx
@@ -192,7 +192,7 @@ private:
     Link<ToolBox *, void> maSelectHdl;
     Link<CommandEvent const *, void> maCommandHandler;
     Link<StateChangedType const *, void> maStateChangedHandler;
-    Link<>              maDataChangedHandler;
+    Link<DataChangedEvent const *, void> maDataChangedHandler;
 
     public:
     using Window::ImplInit;
@@ -506,8 +506,7 @@ public:
     const Link<ToolBox *, void>& GetSelectHdl() const { return maSelectHdl; }
     void                SetCommandHdl( const Link<CommandEvent const *, void>& aLink ) { maCommandHandler = aLink; }
     void                SetStateChangedHdl( const Link<StateChangedType const *, void>& aLink ) { maStateChangedHandler = aLink; }
-    void                SetDataChangedHdl( const Link<>& aLink ) { maDataChangedHandler = aLink; }
-    const Link<>&       GetDataChangedHdl() { return maDataChangedHandler; }
+    void                SetDataChangedHdl( const Link<DataChangedEvent const *, void>& aLink ) { maDataChangedHandler = aLink; }
 
     // support for custom menu (eg for configuration)
     // note: this menu will also be used to display currently
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 3e7d7e86fb6b..067f494967cc 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4471,7 +4471,7 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt )
     }
 
     if ( maDataChangedHandler.IsSet() )
-        maDataChangedHandler.Call( (void*)&rDCEvt );
+        maDataChangedHandler.Call( &rDCEvt );
 }
 
 bool ToolBox::PrepareToggleFloatingMode()