diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 11:07:59 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-06 12:54:23 +0200 |
| commit | 98b5f1164b11ee7b84bf7efc16256afc5c58fcb8 (patch) | |
| tree | 8d3579b6e13ffcf97a42a7039ee24a0c9a4f17fd /framework | |
| parent | e1b8ae4b2e5b5d99a51011a5d18f23df0448e379 (diff) | |
Use typed ToolBox::SetMenuButtonHdl Link
Change-Id: I00cd35374294ccdcc0ac3223ae81ba8129b9a5d7
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index f8e89326beaa..3acc8c6fe3f2 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -138,7 +138,7 @@ class ToolBarManager : public ToolbarManager_Base DECL_LINK_TYPED( DataChanged, DataChangedEvent const *, void ); DECL_LINK( MiscOptionsChanged, void* ); - DECL_LINK( MenuButton, ToolBox * ); + DECL_LINK_TYPED( MenuButton, ToolBox *, void ); DECL_LINK( MenuSelect, Menu * ); DECL_LINK( MenuDeactivate, Menu * ); DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 52d3081f223c..d175b6edba44 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1811,18 +1811,16 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void ) } } -IMPL_LINK( ToolBarManager, MenuButton, ToolBox*, pToolBar ) +IMPL_LINK_TYPED( ToolBarManager, MenuButton, ToolBox*, pToolBar, void ) { SolarMutexGuard g; if ( m_bDisposed ) - return 1; + return; pToolBar->UpdateCustomMenu(); // remove all entries that do not come from the toolbar itself (fdo#38276) ImplClearPopupMenu( pToolBar ); - - return 0; } IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) |