Skip to content

C
core
Kaydet (Commit) e58f9cad authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Work around what looks like MSVC 2013 miscompilation 

Change-Id: Ic2ed1b00d9d29f004f1e3cd60af863d6aafc7188
üst 96dae4ca
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
oox/source/ole/vbaexport.cxx
Dosyayı görüntüle @ e58f9cad
...@@ -410,7 +410,12 @@ void VBAEncryption::writeVersionEnc() ...@@ -410,7 +410,12 @@ void VBAEncryption::writeVersionEnc()
sal_uInt8 VBAEncryption::calculateProjKey(const OUString& rProjectKey) 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(); sal_Int32 n = rProjectKey.getLength();
const sal_Unicode* pString = rProjectKey.getStr(); const sal_Unicode* pString = rProjectKey.getStr();
for (sal_Int32 i = 0; i < n; ++i) for (sal_Int32 i = 0; i < n; ++i)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment