From c9b4c5681194a1cd3297a36d4a1f4e4cc3aac55a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann <sbergman@redhat.com> Date: Tue, 5 May 2015 09:59:27 +0200 Subject: Use typed Idle::SetIdleHdl Link Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9 --- starmath/inc/edit.hxx | 4 ++-- starmath/source/edit.cxx | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'starmath') diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index 7efd852b6c41..b3864744e333 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -65,8 +65,8 @@ class SmEditWindow : public vcl::Window, public DropTargetHelper virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; DECL_LINK(MenuSelectHdl, Menu *); - DECL_LINK(ModifyTimerHdl, Idle *); - DECL_LINK(CursorMoveTimerHdl, Idle *); + DECL_LINK_TYPED(ModifyTimerHdl, Idle *, void); + DECL_LINK_TYPED(CursorMoveTimerHdl, Idle *, void); virtual void DataChanged( const DataChangedEvent& ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 6b7975f57e22..2f0ad530ad37 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -256,20 +256,19 @@ void SmEditWindow::DataChanged( const DataChangedEvent& ) Resize(); } -IMPL_LINK( SmEditWindow, ModifyTimerHdl, Idle *, EMPTYARG /*pTimer*/ ) +IMPL_LINK_NOARG_TYPED( SmEditWindow, ModifyTimerHdl, Idle *, void ) { UpdateStatus(); aModifyIdle.Stop(); - return 0; } -IMPL_LINK(SmEditWindow, CursorMoveTimerHdl, Idle *, EMPTYARG /*pTimer*/) +IMPL_LINK_NOARG_TYPED(SmEditWindow, CursorMoveTimerHdl, Idle *, void) // every once in a while check cursor position (selection) of edit // window and if it has changed (try to) set the formula-cursor // according to that. { if (IsInlineEditEnabled()) - return 0; + return; ESelection aNewSelection(GetSelection()); @@ -289,8 +288,6 @@ IMPL_LINK(SmEditWindow, CursorMoveTimerHdl, Idle *, EMPTYARG /*pTimer*/) } } aCursorMoveIdle.Stop(); - - return 0; } void SmEditWindow::Resize() -- cgit