[Libreoffice-commits] core.git: svl/source

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Jul 17 05:15:00 UTC 2017


 svl/source/crypto/cryptosign.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 846f557fd591626931a9dadb38180786e090104c
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Mon Jul 17 01:04:16 2017 -0400

    svl: fix Android build
    
    Change-Id: Ice5bd4da242297d61392dd7a7e557e0182394125
    Reviewed-on: https://gerrit.libreoffice.org/40031
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index 7d3096d637a3..fc53be7078a0 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -877,6 +877,8 @@ namespace svl {
 
 namespace crypto {
 
+#if defined(SVL_CRYPTO_NSS) || defined(SVL_CRYPTO_MSCRYPTO)
+
 bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
 {
     // Create the PKCS#7 object.
@@ -1647,6 +1649,13 @@ bool Signing::Sign(OStringBuffer& rCMSHexBuffer)
     return true;
 #endif
 }
+#else
+bool Signing::Sign(OStringBuffer&)
+{
+    return false;
+}
+#endif //!SVL_CRYPTO_NSS && !SVL_CRYPTO_MSCRYPTO
+
 
 namespace
 {


More information about the Libreoffice-commits mailing list