oox/source/ole/vbaexport.cxx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
New commits: commit e58f9cad29404670085803a8010729a735759088 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Oct 19 18:08:44 2015 +0200 Work around what looks like MSVC 2013 miscompilation Change-Id: Ic2ed1b00d9d29f004f1e3cd60af863d6aafc7188 diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx index d56d974..cf28e64 100644 --- a/oox/source/ole/vbaexport.cxx +++ b/oox/source/ole/vbaexport.cxx @@ -410,7 +410,12 @@ void VBAEncryption::writeVersionEnc() sal_uInt8 VBAEncryption::calculateProjKey(const OUString& rProjectKey) { - sal_uInt8 nProjKey = 0; + sal_uInt32 nProjKey = 0; + // use sal_uInt32 instead of sal_uInt8 to avoid miscompilation at least + // under "Microsoft (R) C/C++ Optimizing Compiler Version 18.00.31101 + // for x64" with --enable-64-bit and --enable-dbgutil, causing + // CppunitTest_oox_vba_encryption's TestVbaEncryption::testProjKey1 to + // fail with actual 53 vs. expected 223 sal_Int32 n = rProjectKey.getLength(); const sal_Unicode* pString = rProjectKey.getStr(); for (sal_Int32 i = 0; i < n; ++i) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits