summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /forms
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff)
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and return types, but provide default template arguments that keep the generic, unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the Link class can be updated over time. All the related macros are duplicated with ..._TYPED counterparts, that additionally take the RetType (except for LINK_TYPED, which manages to infer the relevant types from the supplied Member). (It would have been attractive to change the "untyped" LinkStubs from taking a void* to a properly typed ArgType parameter, too, but that would cause -fsanitize=function to flag uses of "untyped" Link::Call.) Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'forms')
-rw-r--r--forms/source/component/imgprod.hxx6
-rw-r--r--forms/source/richtext/richtextviewport.hxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx
index 6fcdd7d7b67e..3d701f5599ed 100644
--- a/forms/source/component/imgprod.hxx
+++ b/forms/source/component/imgprod.hxx
@@ -58,7 +58,7 @@ private:
SvStream* mpStm;
sal_uInt32 mnTransIndex;
bool mbConsInit;
- Link maDoneHdl;
+ Link<> maDoneHdl;
bool ImplImportGraphic( Graphic& rGraphic );
void ImplUpdateData( const Graphic& rGraphic );
@@ -75,8 +75,8 @@ public:
void NewDataAvailable();
- void SetDoneHdl( const Link& i_rHdl ) { maDoneHdl = i_rHdl; }
- const Link& GetDoneHdl() const { return maDoneHdl; }
+ void SetDoneHdl( const Link<>& i_rHdl ) { maDoneHdl = i_rHdl; }
+ const Link<>& GetDoneHdl() const { return maDoneHdl; }
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/forms/source/richtext/richtextviewport.hxx b/forms/source/richtext/richtextviewport.hxx
index 6992576793a8..076213da7336 100644
--- a/forms/source/richtext/richtextviewport.hxx
+++ b/forms/source/richtext/richtextviewport.hxx
@@ -30,7 +30,7 @@ namespace frm
{
private:
EditView* m_pView;
- Link m_aInvalidationHandler;
+ Link<> m_aInvalidationHandler;
bool m_bHideInactiveSelection;
public:
@@ -38,7 +38,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; }