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

[Tomaž Vajngerl]

 oox/source/crypto/CryptTools.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 45c1c853544d5bafbce5ea086c9f06347f763ee5
Author: Tomaž Vajngerl <tomaz.vajng...@collabora.com>
Date:   Sun Mar 23 19:33:45 2014 +0100

    oox: cast to avoid compile error
    
    Change-Id: I1ef4f4917f2b97d44c9b39f36fd17b0be6995a4e

diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 414c6db..6901581 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -290,15 +290,16 @@ bool Digest::update(std::vector<sal_uInt8>& input)
 bool Digest::finalize(std::vector<sal_uInt8>& digest)
 {
     digest.clear();
-    sal_uInt32 digestWrittenLength;
 
     #if USE_TLS_OPENSSL
+    unsigned int digestWrittenLength;
     digest.resize(getLength(), 0);
     EVP_DigestFinal_ex(mpContext, &digest[0], &digestWrittenLength);
     #endif
 
     #if USE_TLS_NSS
-    sal_uInt32 digestLength = getLength();
+    unsigned int digestWrittenLength;
+    unsigned int digestLength = static_cast<unsigned int>(getLength());
     digest.resize(digestLength, 0);
     HASH_End(mpContext, &digest[0], &digestWrittenLength, digestLength);
     #endif

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits