summaryrefslogtreecommitdiff
path: root/xmlsecurity
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 /xmlsecurity
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 'xmlsecurity')
-rw-r--r--xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx4
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper.cxx2
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.cxx2
-rw-r--r--xmlsecurity/source/helper/xmlsignaturehelper2.hxx8
4 files changed, 8 insertions, 8 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
index 17cb311f57fb..80f2bffa2695 100644
--- a/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
+++ b/xmlsecurity/inc/xmlsecurity/xmlsignaturehelper.hxx
@@ -105,7 +105,7 @@ private:
XSecController* mpXSecController;
bool mbError;
bool mbODFPre1_2;
- Link maStartVerifySignatureHdl;
+ Link<> maStartVerifySignatureHdl;
private:
DECL_LINK( SignatureCreationResultListener, XMLSignatureCreationResult*);
@@ -130,7 +130,7 @@ public:
// Argument for the Link is a uno::Reference< xml::sax::XAttributeList >*
// Return 1 to verify, 0 to skip.
// Default handler will verify all.
- void SetStartVerifySignatureHdl( const Link& rLink );
+ void SetStartVerifySignatureHdl( const Link<>& rLink );
// Get the security environment
::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > GetSecurityEnvironment();
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<