[Libreoffice-commits] core.git: xmlsecurity/inc xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source

[Thorsten Behrens]

 xmlsecurity/Library_xsec_xmlsec.mk                                |    1 +
 xmlsecurity/inc/certificate.hxx                                   |    2 +-
 xmlsecurity/source/gpg/CertificateImpl.hxx                        |    4 ++--
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 17c7d876431ac2334c2a1d5225dcda56dc42c62c
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Wed Nov 22 12:51:42 2017 +0100

    gpg4libre: fix warnings
    
    This code was not previously built on Windows
    
    Change-Id: I9394907f143d862f40c95672f4e3398b65b7bd2c
    Reviewed-on: https://gerrit.libreoffice.org/45091
    Reviewed-by: Siegmund Gorr <siegmund.gorr at cib.de>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 51f0f2a0834f..30c792177fc8 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_sdk_api,xsec_xmlsec))
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
 	-DXMLSEC_NO_XSLT \
 	-DXSECXMLSEC_DLLIMPLEMENTATION \
+	-DXSECGPG_DLLIMPLEMENTATION \
 ))
 
 $(eval $(call gb_Library_set_precompiled_header,xsec_xmlsec,$(SRCDIR)/xmlsecurity/inc/pch/precompiled_xsec_xmlsec))
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 0698e91f422f..494dc6e30d40 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -25,7 +25,7 @@ public:
     /// Returns the SHA-256 thumbprint.
     ///
     /// @throws css::uno::RuntimeException
-    virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() = 0;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getSHA256Thumbprint() = 0;
 
 protected:
     ~Certificate() noexcept = default;
diff --git a/xmlsecurity/source/gpg/CertificateImpl.hxx b/xmlsecurity/source/gpg/CertificateImpl.hxx
index 9db3ab85de14..63cddc6dc7b9 100644
--- a/xmlsecurity/source/gpg/CertificateImpl.hxx
+++ b/xmlsecurity/source/gpg/CertificateImpl.hxx
@@ -78,8 +78,8 @@ public:
     static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
     /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-    virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override;
-    virtual css::security::CertificateKind getCertificateKind() override;
+    virtual css::uno::Sequence<sal_Int8> SAL_CALL getSHA256Thumbprint() override;
+    virtual css::security::CertificateKind SAL_CALL getCertificateKind() override;
 
     // Helper methods
     void setCertificate(GpgME::Context* ctx, const GpgME::Key& key);
diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
index b36b1c3c5d8f..94d53529bf21 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx
@@ -80,7 +80,7 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper<
         virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
 
         /// @see xmlsecurity::Certificate::getSHA256Thumbprint().
-        virtual css::uno::Sequence<sal_Int8> getSHA256Thumbprint() override;
+        virtual css::uno::Sequence<sal_Int8> SAL_CALL getSHA256Thumbprint() override;
 
         static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId() ;
         static X509Certificate_MSCryptImpl* getImplementation( const css::uno::Reference< css::uno::XInterface >& rObj ) ;