summaryrefslogtreecommitdiff
path: root/sfx2/source/appl/helpinterceptor.hxx
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 /sfx2/source/appl/helpinterceptor.hxx
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 'sfx2/source/appl/helpinterceptor.hxx')
-rw-r--r--sfx2/source/appl/helpinterceptor.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index a990518bc7a4..f5ce4bb9d1ac 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -120,7 +120,7 @@ class HelpListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::fram
{
private:
HelpInterceptor_Impl* pInterceptor;
- Link aChangeLink;
+ Link<> aChangeLink;
OUString aFactory;
public:
@@ -131,7 +131,7 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj )
throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- void SetChangeHdl( const Link& rLink ) { aChangeLink = rLink; }
+ void SetChangeHdl( const Link<>& rLink ) { aChangeLink = rLink; }
OUString GetFactory() const { return aFactory; }
};
// HelpStatusListener_Impl -----------------------------------------------------