[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/source

[Caolán McNamara]

 sd/source/filter/ppt/propread.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7a1b2ca03e4d84fc687f9a931bb511e761598556
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 18 12:27:45 2015 +0100

    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 at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sd/source/filter/ppt/propread.cxx b/sd/source/filter/ppt/propread.cxx
index 08987b5..f73d26f 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