filter/source/msfilter/svdfppt.cxx | 23 ++++++++--------------- include/filter/msfilter/svdfppt.hxx | 1 - 2 files changed, 8 insertions(+), 16 deletions(-)
New commits: commit 87aa067bae975363c373d94462554f5fece5bb77 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Dec 1 15:54:18 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Dec 1 19:20:01 2024 +0100 This TODO got fixed in 2016 with: commit 8a2149c1059c70d67b4897e8a7751cf028a5136b CommitDate: Fri May 20 07:55:30 2016 +0000 clang-tidy misc-assign-operator-signature Change-Id: I9ffbfd4cfa5742b4fa62b616591c19ebe3fc1f0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177615 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index a12655baa4e7..36a23be19315 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5058,11 +5058,7 @@ void PPTStyleTextPropReader::ReadParaProps(SvStream& rIn, const DffRecordHeader& { bTextPropAtom = false; nCharCount = nStringLen - nCharReadCnt; - // please fix the right hand side of - // PPTParaPropSet& PPTParaPropSet::operator=(PPTParaPropSet&), - // it should be a const reference - PPTParaPropSet aTmpPPTParaPropSet; - aParaPropSet = aTmpPPTParaPropSet; + aParaPropSet = PPTParaPropSet(); OSL_FAIL( "SJ:PPTStyleTextPropReader::could not get this PPT_PST_StyleTextPropAtom by reading the paragraph attributes" ); } PPTParaPropSet* pPara = new PPTParaPropSet( aParaPropSet ); commit 2ca770830cd2129470de486b41a0d68727aeb00b Author: Caolán McNamara <[email protected]> AuthorDate: Sun Dec 1 15:42:03 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Dec 1 19:19:54 2024 +0100 nothing consumes the ReadParaProps nCharCount arg, so drop it from params Change-Id: Iea1bd3bb7df6466aeee480d8e44659b71bef580e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177614 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 689c6ff7ebcd..a12655baa4e7 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -4829,9 +4829,9 @@ PPTStyleTextPropReader::PPTStyleTextPropReader( SvStream& rIn, const DffRecordHe Init(rIn, rTextHeader, rRuler, rExtParaHd, nInstance); } -void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, const DffRecordHeader& rTextHeader, - const OUString& aString, PPTTextRulerInterpreter const & rRuler, - sal_uInt32& nCharCount, bool& bTextPropAtom ) +void PPTStyleTextPropReader::ReadParaProps(SvStream& rIn, const DffRecordHeader& rTextHeader, + const OUString& aString, PPTTextRulerInterpreter const & rRuler, + bool& bTextPropAtom) { sal_uInt32 nMask = 0; //TODO: nMask initialized here to suppress warning for now, see corresponding TODO below sal_uInt32 nCharReadCnt = 0; @@ -4846,6 +4846,7 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, const DffRecordHeader while ( nCharReadCnt <= nStringLen ) { PPTParaPropSet aParaPropSet; + sal_uInt32 nCharCount(0); ImplPPTParaPropSet& aSet = *aParaPropSet.mxParaSet; if ( bTextPropAtom ) { @@ -5069,9 +5070,8 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, const DffRecordHeader aParaPropList.emplace_back( pPara ); if ( nCharCount ) { - sal_uInt32 nCount; const sal_Unicode* pDat = aString.getStr() + nCharReadCnt; - for ( nCount = 0; nCount < nCharCount; nCount++ ) + for (sal_uInt32 nCount = 0; nCount < nCharCount; ++nCount) { if ( pDat[ nCount ] == 0xd ) { @@ -5270,9 +5270,8 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe else { // no chars, but potentially char/para props? - sal_uInt32 nParaCharCount; bool bTextPropAtom = false; - ReadParaProps( rIn, rTextHeader, aString, rRuler, nParaCharCount, bTextPropAtom ); + ReadParaProps(rIn, rTextHeader, aString, rRuler, bTextPropAtom); if ( bTextPropAtom ) { @@ -5294,10 +5293,8 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, const DffRecordHeader& rTextHe const sal_uInt32 nStringLen = aString.getLength(); if (nStringLen) { - sal_uInt32 nParaCharCount; bool bTextPropAtom = false; - - ReadParaProps( rIn, rTextHeader, aString, rRuler, nParaCharCount, bTextPropAtom ); + ReadParaProps(rIn, rTextHeader, aString, rRuler, bTextPropAtom); bool bEmptyParaPossible = true; sal_uInt32 nCharReadCnt = 0; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index eddcda824a68..dcb6f87061d2 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -1082,7 +1082,6 @@ struct PPTStyleTextPropReader const DffRecordHeader& rTextHeader, const OUString& aString, PPTTextRulerInterpreter const & rRuler, - sal_uInt32& nCharCount, bool& bTextPropAtom ); // returns CharCount
