summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-08-13 22:37:21 +0200
committerMichael Stahl <mstahl@redhat.com>2014-08-13 23:01:01 +0200
commitc980d4970b7c19463739d6584632304f9a5d536d (patch)
tree9f8774b0a276fb01e65d0f76852307fd9fc9761a /oox
parentfb9927d7cbfe26215990bc8cce8f31e14bbb3c0a (diff)
warning C4245 signed/unsigned mismatch
Change-Id: If28543252ee2265e9edd7d7963c1751bd21e754d
Diffstat (limited to 'oox')
-rw-r--r--oox/source/crypto/CryptTools.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 1d8a432ae2b8..4e0d189b735f 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -63,7 +63,7 @@ const EVP_CIPHER* Crypto::getCipher(CryptoType type)
#if USE_TLS_NSS
void Crypto::setupContext(vector<sal_uInt8>& key, vector<sal_uInt8>& iv, CryptoType type, CK_ATTRIBUTE_TYPE operation)
{
- CK_MECHANISM_TYPE mechanism = -1;
+ CK_MECHANISM_TYPE mechanism = static_cast<CK_ULONG>(-1);
SECItem ivItem;
ivItem.type = siBuffer;