diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 23:15:53 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 08:20:56 +0200 |
| commit | 8ff3a90d3c49b4c062fb6c2f0e80d8489f8bbe3e (patch) | |
| tree | 5d97827217b2bd430fefbb4a7ceddd74d6811084 /framework | |
| parent | b515d1f36fdf8c242079da60eb4ecd5fd456583c (diff) | |
Use typed ToolBox::SetActivateHdl Link
Change-Id: I15044bd9ea94562c1d4727f64aa0b32543e0cc0a
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 561cfca25f0e..1dc3f14a9edb 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/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* ); diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 56db2819b72d..6e8ea309fd31 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/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* ); diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index bc6a4b0b497c..506ddd680b10 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/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) { diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 75baaa504d90..30869c14df39 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/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) { |