From 146fe08382999faf77d268a24ba3ef3bfea18a7e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 23 Sep 2015 09:55:11 +0200 Subject: convert Link<> to typed Change-Id: Ica5093e29630d6d6974ccba034609129887ac85b Reviewed-on: https://gerrit.libreoffice.org/18802 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- forms/source/richtext/richtextimplcontrol.cxx | 3 +-- forms/source/richtext/richtextimplcontrol.hxx | 2 +- forms/source/richtext/richtextviewport.hxx | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'forms/source/richtext') diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 32b512a9b623..2bece2f25133 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -311,10 +311,9 @@ namespace frm } - IMPL_LINK_NOARG( RichTextControlImpl, OnInvalidateAllAttributes ) + IMPL_LINK_NOARG_TYPED( RichTextControlImpl, OnInvalidateAllAttributes, LinkParamNone*, void ) { updateAllAttributes(); - return 0L; } diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index 48087c0eb174..7d0f3489a78d 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -173,7 +173,7 @@ namespace frm virtual void EditEngineStatusChanged( const EditStatus& _rStatus ) SAL_OVERRIDE; private: - DECL_LINK( OnInvalidateAllAttributes, void* ); + DECL_LINK_TYPED( OnInvalidateAllAttributes, LinkParamNone*, void ); DECL_LINK_TYPED( OnHScroll, ScrollBar*, void ); DECL_LINK_TYPED( OnVScroll, ScrollBar*, void ); }; diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx index f67025e062e6..f6f380e21c7f 100644 --- a/forms/source/richtext/richtextviewport.hxx +++ b/forms/source/richtext/richtextviewport.hxx @@ -29,7 +29,7 @@ namespace frm { private: EditView* m_pView; - Link<> m_aInvalidationHandler; + Link m_aInvalidationHandler; bool m_bHideInactiveSelection; public: @@ -37,7 +37,7 @@ namespace frm void setView( EditView& _rView ); - inline void setAttributeInvalidationHandler( const Link<>& _rHandler ) { m_aInvalidationHandler = _rHandler; } + inline void setAttributeInvalidationHandler( const Link& _rHandler ) { m_aInvalidationHandler = _rHandler; } void SetHideInactiveSelection( bool _bHide ); bool GetHideInactiveSelection() const { return m_bHideInactiveSelection; } -- cgit v1.2.3