helpcontent2 | 2 +- oox/source/crypto/CryptTools.cxx | 2 +- sc/source/core/tool/formulagroup.cxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit cada99ef062a5676fe27c8933fb4a585b694807c Author: Michael Stahl <[email protected]> Date: Wed Aug 13 23:00:13 2014 +0200 helpcontent2: somebody messed up the submodule again... Change-Id: I7c7888ffcc613c1627ad2ed69db68ff64f596a85 diff --git a/helpcontent2 b/helpcontent2 index 577577f..1fbcc73 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 577577fd7006327a85f420360c769ca70e96b50c +Subproject commit 1fbcc737e36231426bedfdca0b172bbb90279d64 commit 57c59b2466afbff92bd50daa27dbe3234fb3a192 Author: Michael Stahl <[email protected]> Date: Wed Aug 13 22:49:32 2014 +0200 warning C4245 signed/unsigned mismatch Change-Id: Ibff6c806c287a2303cdf3b1942d5d5014a73bd30 diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index 997d8b7..a862b0c 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -702,8 +702,8 @@ void FormulaGroupInterpreter::getOpenCLDeviceInfo(sal_Int32& rDeviceId, sal_Int3 #if HAVE_FEATURE_OPENCL - size_t aDeviceId = -1; - size_t aPlatformId = -1; + size_t aDeviceId = static_cast<size_t>(-1); + size_t aPlatformId = static_cast<size_t>(-1); #ifndef DISABLE_DYNLOADING osl::Module* pModule = getOpenCLModule(); commit c980d4970b7c19463739d6584632304f9a5d536d Author: Michael Stahl <[email protected]> Date: Wed Aug 13 22:37:21 2014 +0200 warning C4245 signed/unsigned mismatch Change-Id: If28543252ee2265e9edd7d7963c1751bd21e754d diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx index 1d8a432..4e0d189 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; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
