Kaydet (Commit) 24d90b8a authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I936606b6fdbb5db50661bde68fc8472bb9dd8861
Reviewed-on: https://gerrit.libreoffice.org/18317Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 6741a0f2
......@@ -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 );
......
......@@ -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;
}
}
......
......@@ -91,8 +91,8 @@ private:
bool mbProgressMode;
bool mbInUserDraw;
bool mbAdjustHiDPI;
Link<> maClickHdl;
Link<> maDoubleClickHdl;
Link<StatusBar*,void> maClickHdl;
Link<StatusBar*,void> maDoubleClickHdl;
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
......@@ -191,8 +191,8 @@ public:
Size CalcWindowSizePixel() const;
void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; }
void SetDoubleClickHdl( const Link<>& rLink ) { maDoubleClickHdl = rLink; }
void SetClickHdl( const Link<StatusBar*,void>& rLink ) { maClickHdl = rLink; }
void SetDoubleClickHdl( const Link<StatusBar*,void>& rLink ) { maDoubleClickHdl = rLink; }
using Window::SetAccessibleName;
void SetAccessibleName( sal_uInt16 nItemId, const OUString& rName );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment