diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-06 12:05:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-07 06:56:57 +0000 |
| commit | 9af27324f5f5ef9bd340c6df8640b146a3eba21c (patch) | |
| tree | 1bab2dbd1185adf86714718f5fb1a757c1a101e9 /framework/source | |
| parent | 67a5fbeb8e2d6775ff6bd7bfd35ff5027d38457c (diff) | |
convert Link<> to typed
Change-Id: I38f2c15b4f8bb1d7187b019d26a2644b087898c1
Reviewed-on: https://gerrit.libreoffice.org/18357
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework/source')
4 files changed, 10 insertions, 10 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 039871da550d..5e72a344222d 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -813,7 +813,7 @@ IMPL_LINK_TYPED( MenuManager, Deactivate, Menu *, pMenu, bool ) return true; } -IMPL_LINK( MenuManager, Select, Menu *, pMenu ) +IMPL_LINK_TYPED( MenuManager, Select, Menu *, pMenu, bool ) { URL aTargetURL; Sequence<PropertyValue> aArgs; @@ -883,7 +883,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) if ( xDispatch.is() ) xDispatch->dispatch( aTargetURL, aArgs ); - return 1; + return true; } IMPL_LINK_NOARG_TYPED(MenuManager, Highlight, Menu *, bool) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 0d951c08fefa..3a3c5124cd2e 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -954,7 +954,7 @@ IMPL_LINK_NOARG_TYPED( MenuBarManager, AsyncSettingsHdl, Timer*, void) } } -IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) +IMPL_LINK_TYPED( MenuBarManager, Select, Menu *, pMenu, bool ) { URL aTargetURL; Sequence<PropertyValue> aArgs; @@ -1021,7 +1021,7 @@ IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) xDispatch->dispatch( aTargetURL, aArgs ); } - return 1; + return true; } IMPL_LINK_NOARG_TYPED(MenuBarManager, Highlight, Menu *, bool) diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index 48f9e1ccc8ef..0ea0cbf90375 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -263,7 +263,7 @@ void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::sta } } -IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu ) +IMPL_LINK_TYPED( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu, bool ) { SolarMutexGuard aGuard; @@ -274,7 +274,7 @@ IMPL_LINK( ToggleButtonToolbarController, MenuSelectHdl, Menu *, pMenu ) execute( 0 ); } - return 0; + return false; } } // namespace diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 2224e5cbcf3c..f19c611c2e50 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1831,7 +1831,7 @@ IMPL_LINK_TYPED( ToolBarManager, Command, CommandEvent const *, pCmdEvt, void ) if (pManagerMenu) { // Unlink our listeners again -- see above for why. - pManagerMenu->SetSelectHdl( Link<>() ); + pManagerMenu->SetSelectHdl( Link<Menu*, bool>() ); pManagerMenu->SetDeactivateHdl( Link<Menu *, bool>() ); } } @@ -1849,7 +1849,7 @@ IMPL_LINK_TYPED( ToolBarManager, MenuButton, ToolBox*, pToolBar, void ) ImplClearPopupMenu( pToolBar ); } -IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) +IMPL_LINK_TYPED( ToolBarManager, MenuSelect, Menu*, pMenu, bool ) { // We have to hold a reference to ourself as it is possible that we will be disposed and // our refcount could be zero (destruction) otherwise. @@ -1861,7 +1861,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) SolarMutexGuard g; if ( m_bDisposed ) - return 1; + return true; switch ( pMenu->GetCurItemId() ) { @@ -2026,7 +2026,7 @@ IMPL_LINK( ToolBarManager, MenuSelect, Menu*, pMenu ) ImplClearPopupMenu( m_pToolBar ); } - return 1; + return true; } IMPL_LINK_NOARG_TYPED(ToolBarManager, Select, ToolBox *, void) |