diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-09-03 18:37:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-04 06:32:49 +0000 |
| commit | 24d90b8aa8e49507d02aa87a0b726ec303a27518 (patch) | |
| tree | 28e472f42f557390998ff86ca9e979fe30259a57 /framework | |
| parent | 6741a0f25a0193941135636833e1068ee12fc77f (diff) | |
convert Link<> to typed
Change-Id: I936606b6fdbb5db50661bde68fc8472bb9dd8861
Reviewed-on: https://gerrit.libreoffice.org/18317
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/statusbarmanager.hxx | 4 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index 0159a6687f55..9dfeed34058b 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -86,8 +86,8 @@ class StatusBarManager : public ::cppu::WeakImplHelper< void MouseMove( const MouseEvent& rMEvt ); void MouseButtonDown( const MouseEvent& rMEvt ); void MouseButtonUp( const MouseEvent& rMEvt ); - DECL_LINK(Click, void *); - DECL_LINK(DoubleClick, void *); + DECL_LINK_TYPED(Click, StatusBar*, void); + DECL_LINK_TYPED(DoubleClick, StatusBar*, void); void RemoveControllers(); OUString RetrieveLabelFromCommand( const OUString& aCmdURL ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 5a034bb95c87..cd44aa1e34ca 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -654,12 +654,12 @@ void StatusBarManager::MouseButtonUp( const MouseEvent& rMEvt ) MouseButton(rMEvt,&frame::XStatusbarController::mouseButtonUp); } -IMPL_LINK_NOARG(StatusBarManager, Click) +IMPL_LINK_NOARG_TYPED(StatusBarManager, Click, StatusBar*, void) { SolarMutexGuard g; if ( m_bDisposed ) - return 1; + return; sal_uInt16 nId = m_pStatusBar->GetCurItemId(); StatusBarControllerMap::const_iterator it = m_aControllerMap.find( nId ); @@ -673,16 +673,14 @@ IMPL_LINK_NOARG(StatusBarManager, Click) xController->click( aAWTPoint ); } } - - return 1; } -IMPL_LINK_NOARG(StatusBarManager, DoubleClick) +IMPL_LINK_NOARG_TYPED(StatusBarManager, DoubleClick, StatusBar*, void) { SolarMutexGuard g; if ( m_bDisposed ) - return 1; + return; sal_uInt16 nId = m_pStatusBar->GetCurItemId(); StatusBarControllerMap::const_iterator it = m_aControllerMap.find( nId ); @@ -696,8 +694,6 @@ IMPL_LINK_NOARG(StatusBarManager, DoubleClick) xController->doubleClick( aAWTPoint ); } } - - return 1; } } |