core.git: filter/source

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/svdfppt.cxx |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 6b4908d77dbe29c8d3ba81523fce7ee2ed5102ec
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Dec 1 15:39:16 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Dec 1 19:19:38 2024 +0100

    disentangle nCharCount variable used for two different things
    
    Change-Id: Ia8a5eef35c7a4ccdc9d7747fbb408f670777a49b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177613
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Tested-by: Jenkins

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 1d1715c545e5..689c6ff7ebcd 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -5270,9 +5270,9 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const 
DffRecordHeader& rTextHe
     else
     {
         // no chars, but potentially char/para props?
-        sal_uInt32  nCharCount;
+        sal_uInt32  nParaCharCount;
         bool        bTextPropAtom = false;
-        ReadParaProps( rIn, rTextHeader, aString, rRuler, nCharCount, 
bTextPropAtom );
+        ReadParaProps( rIn, rTextHeader, aString, rRuler, nParaCharCount, 
bTextPropAtom );
 
         if ( bTextPropAtom )
         {
@@ -5283,9 +5283,9 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const 
DffRecordHeader& rTextHe
 
             sal_uInt32 nExtParaFlags = 0, nAnmScheme = 0;
             sal_uInt16 nBuBlip = 0xffff, nHasAnm = 0;
-            nCharCount = ReadCharProps( rIn, aCharPropSet, aString, 
0/*nCharReadCnt*/,
-                           bTextPropAtom, nExtParaPos, aStyleTextProp9, 
nExtParaFlags,
-                           nBuBlip, nHasAnm, nAnmScheme );
+            ReadCharProps(rIn, aCharPropSet, aString, 0/*nCharReadCnt*/,
+                          bTextPropAtom, nExtParaPos, aStyleTextProp9, 
nExtParaFlags,
+                          nBuBlip, nHasAnm, nAnmScheme);
 
             
aCharPropList.push_back(std::make_unique<PPTCharPropSet>(aCharPropSet, 0));
         }
@@ -5294,10 +5294,10 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const 
DffRecordHeader& rTextHe
     const sal_uInt32 nStringLen = aString.getLength();
     if (nStringLen)
     {
-        sal_uInt32  nCharCount;
+        sal_uInt32  nParaCharCount;
         bool        bTextPropAtom = false;
 
-        ReadParaProps( rIn, rTextHeader, aString, rRuler, nCharCount, 
bTextPropAtom );
+        ReadParaProps( rIn, rTextHeader, aString, rRuler, nParaCharCount, 
bTextPropAtom );
 
         bool bEmptyParaPossible = true;
         sal_uInt32 nCharReadCnt = 0;
@@ -5309,6 +5309,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const 
DffRecordHeader& rTextHe
         {
             sal_uInt32 nExtParaFlags = 0, nLatestParaUpdate = 0xffffffff, 
nAnmScheme = 0;
             sal_uInt16 nBuBlip = 0xffff, nHasAnm = 0;
+            sal_uInt32 nCharCount;
 
             PPTCharPropSet aCharPropSet( nCurrentPara );
             if ( bTextPropAtom )