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 /starmath | |
| parent | 3363f828d63775a11073276dce927b9538b57be6 (diff) | |
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/view.hxx | 4 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 29d093721d4e..ddb59154f51d 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -88,7 +88,7 @@ protected: private: void RepaintViewShellDoc(); - DECL_LINK(CaretBlinkTimerHdl, void *); + DECL_LINK_TYPED(CaretBlinkTimerHdl, Timer *, void); void CaretBlinkInit(); void CaretBlinkStart(); void CaretBlinkStop(); @@ -166,7 +166,7 @@ class SmCmdBoxWindow : public SfxDockingWindow Timer aInitialFocusTimer; - DECL_LINK(InitialFocusTimerHdl, Timer *); + DECL_LINK_TYPED(InitialFocusTimerHdl, Timer *, void); protected : diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 304327be8f3b..a9ae7e1fa116 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -273,7 +273,7 @@ void SmGraphicWindow::RepaintViewShellDoc() pDoc->Repaint(); } -IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl) +IMPL_LINK_NOARG_TYPED(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void) { if (IsCursorVisible()) SetIsCursorVisible(false); @@ -281,8 +281,6 @@ IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl) SetIsCursorVisible(true); RepaintViewShellDoc(); - - return 0; } void SmGraphicWindow::CaretBlinkInit() @@ -820,7 +818,7 @@ void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange ) } -IMPL_LINK( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, EMPTYARG /*pTimer*/ ) +IMPL_LINK_NOARG_TYPED( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void ) { // We want to have the focus in the edit window once Math has been opened // to allow for immediate typing. @@ -857,7 +855,6 @@ IMPL_LINK( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, EMPTYARG /*pTimer*/ ) { SAL_WARN( "starmath", "failed to properly set initial focus to edit window" ); } - return 0; } |