summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-09-18 12:27:45 +0100
committerDavid Tardon <dtardon@redhat.com>2015-09-18 12:36:07 +0000
commit7a1b2ca03e4d84fc687f9a931bb511e761598556 (patch)
treef7af9a433b6cd0b62101d8aa0310d6a156f91218
parent2304679d479f848c41ca23fc4bfdd1e35da87047 (diff)
reusing i here from the outer loop is definitely bogus
(cherry picked from commit 637ad743bb74a826ddd4db5efbcd33779b9132cd) Change-Id: I4ee52c76b2c1723639185bc99b85d83be5b4fdd7 Reviewed-on: https://gerrit.libreoffice.org/18687 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--sd/source/filter/ppt/propread.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 08987b58f0d5..f73d26fbaa3f 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -301,9 +301,9 @@ bool Section::GetDictionary( Dictionary& rDict )
{
nSize >>= 1;
aStream.Seek( nPos );
- sal_Unicode* pWString = (sal_Unicode*)pString;
- for ( i = 0; i < nSize; i++ )
- aStream.ReadUInt16( pWString[ i ] );
+ sal_Unicode* pWString = reinterpret_cast<sal_Unicode*>(pString);
+ for (sal_uInt32 j = 0; j < nSize; ++j)
+ aStream.ReadUInt16(pWString[j]);
aString = OUString(pWString, lcl_getMaxSafeStrLen(nSize));
}
else