From 78b124143a3c2bd82984c1c06aa3265c211cef13 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 8 Sep 2015 12:45:38 +0200 Subject: convert Link<> to typed Change-Id: I2f36a123662488ef5534f7bf0845d61e497fb0ec --- svtools/source/contnr/imivctl1.cxx | 10 ++++------ svtools/source/contnr/treelistbox.cxx | 6 ++---- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'svtools') diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 81fb69675e3b..4c232868fa78 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -65,8 +65,8 @@ class IcnViewEdit_Impl : public MultiLineEdit void CallCallBackHdl_Impl(); DECL_LINK_TYPED(Timeout_Impl, Idle *, void); - DECL_LINK( ReturnHdl_Impl, Accelerator * ); - DECL_LINK( EscapeHdl_Impl, Accelerator * ); + DECL_LINK_TYPED( ReturnHdl_Impl, Accelerator&, void ); + DECL_LINK_TYPED( EscapeHdl_Impl, Accelerator&, void ); public: @@ -3187,20 +3187,18 @@ IMPL_LINK_NOARG_TYPED(IcnViewEdit_Impl, Timeout_Impl, Idle *, void) CallCallBackHdl_Impl(); } -IMPL_LINK( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator*, ) +IMPL_LINK_NOARG_TYPED( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator&, void ) { bCanceled = false; bGrabFocus = true; CallCallBackHdl_Impl(); - return 1; } -IMPL_LINK( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator*, ) +IMPL_LINK_NOARG_TYPED( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator&, void ) { bCanceled = true; bGrabFocus = true; CallCallBackHdl_Impl(); - return 1; } void IcnViewEdit_Impl::KeyInput( const KeyEvent& rKEvt ) diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index e2b496b79412..d5bce70a2a34 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -185,18 +185,16 @@ void SvInplaceEdit2::Hide() } -IMPL_LINK_NOARG(SvInplaceEdit2, ReturnHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvInplaceEdit2, ReturnHdl_Impl, Accelerator&, void) { bCanceled = false; CallCallBackHdl_Impl(); - return 1; } -IMPL_LINK_NOARG(SvInplaceEdit2, EscapeHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvInplaceEdit2, EscapeHdl_Impl, Accelerator&, void) { bCanceled = true; CallCallBackHdl_Impl(); - return 1; } bool SvInplaceEdit2::KeyInput( const KeyEvent& rKEvt ) -- cgit