diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 23:35:34 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 08:20:56 +0200 |
| commit | c8fdfc39ebf89e10bc01bf9569b29b5b4c85d40d (patch) | |
| tree | 73e3178f1c022413dd81b70f1576ac3b388ac8b2 /framework | |
| parent | 8ff3a90d3c49b4c062fb6c2f0e80d8489f8bbe3e (diff) | |
Use typed ToolBox::SetDeactivateHdl Link
Change-Id: Ia2521b000e962a0cc461a54f73b5c97bbe34a602
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 | 6 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 8 |
4 files changed, 7 insertions, 11 deletions
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 1dc3f14a9edb..542a366f48dc 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/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* ); diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 6e8ea309fd31..7e1ae3b7c8aa 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/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* ); diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 506ddd680b10..ca56c441624a 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/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 ) { diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 30869c14df39..ca2c94356642 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/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 ) { |