diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 10:56:13 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 12:54:23 +0200 |
commit | e1b8ae4b2e5b5d99a51011a5d18f23df0448e379 (patch) | |
tree | e65202c730c090c5ca5f3dfc7ad31dff35127fd8 /framework | |
parent | f9830183e1076fcbaa757f2220070b4bfe804231 (diff) |
Use typed ToolBox::SetDataChangedHdl Link
Change-Id: Ia4fe932e765651653e6c534e755a8fc32875ffc3
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/uielement/addonstoolbarmanager.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/addonstoolbarmanager.cxx | 4 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 6 |
4 files changed, 5 insertions, 9 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) |