diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:28:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 10:21:54 +0200 |
| commit | 8cafd08278c0b925aac91ea94d8f907d98f07047 (patch) | |
| tree | 1c2b0e57c895511fdc67f8063647cc520ef5eaeb /reportdesign/source | |
| parent | 3363f828d63775a11073276dce927b9538b57be6 (diff) | |
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/ui/inc/dlgedfunc.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/dlgedfunc.cxx | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index dd4185ddab20..d14d6ab08d7d 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -185,7 +185,7 @@ public: virtual void dispose() SAL_OVERRIDE; DECL_LINK(OnEntrySelDesel, NavigatorTree*); - DECL_LINK( OnDropActionTimer, void* ); + DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); virtual void _selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) SAL_OVERRIDE; @@ -423,10 +423,10 @@ void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel ) } } -IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) +IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void) { if (--m_nTimerCounter > 0) - return 0L; + return; switch ( m_aDropActionType ) { @@ -450,8 +450,6 @@ IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) break; } - - return 0L; } diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 8f8938b6f545..32639c87eeda 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -53,7 +53,7 @@ protected: bool m_bUiActive; bool m_bShowPropertyBrowser; - DECL_LINK( ScrollTimeout, Timer * ); + DECL_LINK_TYPED( ScrollTimeout, Timer *, void ); void ForceScroll( const Point& rPos ); /** checks that no other object is overlapped. * diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index a1d2676f971a..6182625745e6 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -62,10 +62,9 @@ using namespace ::com::sun::star; -IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, ) +IMPL_LINK_NOARG_TYPED( DlgEdFunc, ScrollTimeout, Timer *, void ) { ForceScroll( m_pParent->PixelToLogic( m_pParent->GetPointerPosPixel() ) ); - return 0; } |