From 55dda8e8d0a29ae150f58168d72ab2611ed2b8a8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 21 Sep 2015 09:14:04 +0200 Subject: convert Link<> to typed Change-Id: I92df586295c11bc9e9276770656901c2e4e714b9 --- include/test/bootstrapfixture.hxx | 2 +- include/vcl/cvtgrf.hxx | 8 ++++---- include/vcl/svapp.hxx | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/test/bootstrapfixture.hxx b/include/test/bootstrapfixture.hxx index 069e470be156..f44c5b82d21b 100644 --- a/include/test/bootstrapfixture.hxx +++ b/include/test/bootstrapfixture.hxx @@ -46,7 +46,7 @@ class OOO_DLLPUBLIC_TEST BootstrapFixture : public BootstrapFixtureBase bool m_bAssertOnDialog; public: - DECL_STATIC_LINK( BootstrapFixture, ImplInitFilterHdl, ConvertData* ); + DECL_STATIC_LINK_TYPED( BootstrapFixture, ImplInitFilterHdl, ConvertData&, bool ); BootstrapFixture( bool bAssertOnDialog = true, bool bNeedUCB = true ); virtual ~BootstrapFixture(); diff --git a/include/vcl/cvtgrf.hxx b/include/vcl/cvtgrf.hxx index e311c39b6936..b869a61c181a 100644 --- a/include/vcl/cvtgrf.hxx +++ b/include/vcl/cvtgrf.hxx @@ -35,8 +35,8 @@ class VCL_DLLPUBLIC GraphicConverter { private: - Link<> maFilterHdl; - ConvertData* mpConvertData; + Link maFilterHdl; + ConvertData* mpConvertData; public: @@ -48,8 +48,8 @@ public: ConvertData* GetConvertData() { return mpConvertData; } - void SetFilterHdl( const Link<>& rLink ) { maFilterHdl = rLink; } - const Link<>& GetFilterHdl() const { return maFilterHdl; } + void SetFilterHdl( const Link& rLink ) { maFilterHdl = rLink; } + const Link& GetFilterHdl() const { return maFilterHdl; } }; #endif // INCLUDED_VCL_CVTGRF_HXX diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index c2b6d045466e..1d8392cd6b5a 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -58,6 +58,7 @@ class MouseEvent; class ZoomEvent; class ScrollEvent; struct ImplSVEvent; +struct ConvertData; #include #include @@ -1344,7 +1345,7 @@ public: @see GetFilterHdl */ - static void SetFilterHdl( const Link<>& rLink ); + static void SetFilterHdl( const Link& rLink ); ///@} -- cgit