From 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 30 Apr 2015 10:20:00 +0200
Subject: 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
---
 xmlsecurity/source/helper/xmlsignaturehelper.cxx  | 2 +-
 xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 2 +-
 xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'xmlsecurity/source/helper')

diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
index b8756c244620..84004ae5ef70 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx
@@ -85,7 +85,7 @@ void XMLSignatureHelper::SetStorage(
 }
 
 
-void XMLSignatureHelper::SetStartVerifySignatureHdl( const Link& rLink )
+void XMLSignatureHelper::SetStartVerifySignatureHdl( const Link<>& rLink )
 {
     maStartVerifySignatureHdl = rLink;
 }
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
index 64e3deaba755..25934703dc7c 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.cxx
@@ -32,7 +32,7 @@
 
 using namespace com::sun::star;
 
-ImplXMLSignatureListener::ImplXMLSignatureListener(const Link& rCreationResultListenerListener, const Link& rVerifyResultListenerListener, const Link& rStartSignatureElement)
+ImplXMLSignatureListener::ImplXMLSignatureListener(const Link<>& rCreationResultListenerListener, const Link<>& rVerifyResultListenerListener, const Link<>& rStartSignatureElement)
 {
     maCreationResultListenerListener = rCreationResultListenerListener;
     maVerifyResultListenerListener = rVerifyResultListenerListener;
diff --git a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
index abe0a393164b..f93aa392e810 100644
--- a/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
+++ b/xmlsecurity/source/helper/xmlsignaturehelper2.hxx
@@ -49,15 +49,15 @@ class ImplXMLSignatureListener : public cppu::WeakImplHelper3
 >
 {
 private:
-    Link        maCreationResultListenerListener;
-    Link        maVerifyResultListenerListener;
-    Link        maStartVerifySignatureElementListener;
+    Link<>      maCreationResultListenerListener;
+    Link<>      maVerifyResultListenerListener;
+    Link<>      maStartVerifySignatureElementListener;
 
     com::sun::star::uno::Reference<
         com::sun::star::xml::sax::XDocumentHandler > m_xNextHandler;
 
 public:
-    ImplXMLSignatureListener(const Link& rCreationResultListenerListener, const Link& rVerifyResultListenerListener, const Link& rStartVerifySignatureElement);
+    ImplXMLSignatureListener(const Link<>& rCreationResultListenerListener, const Link<>& rVerifyResultListenerListener, const Link<>& rStartVerifySignatureElement);
     virtual ~ImplXMLSignatureListener();
 
     void setNextHandler(com::sun::star::uno::Reference<
-- 
cgit