strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

disentangle nCharCount variable used for two different things

Browse source 
Change-Id: Ia8a5eef35c7a4ccdc9d7747fbb408f670777a49b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177613
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Caolán McNamara 2024-12-01 15:39:16 +00:00
parent caeed20075
commit 6b4908d77d
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
filter/source/msfilter/svdfppt.cxx
View file

@ -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 )