From efc3412b1a86dfff56c49364efb36256d057a1e1 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 31 May 2021 08:53:32 +0200 Subject: sw: prefix members of HTMLEndPosLst, SwFltStackEntry, SwFltTOX and ... ... SwHTMLNumRuleInfo See tdf#94879 for motivation. Change-Id: Ie091511f7b2fff3949295c310045631676879655 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116421 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/source/filter/basflt/fltshell.cxx | 82 +++++++------- sw/source/filter/html/htmlatr.cxx | 206 +++++++++++++++++----------------- sw/source/filter/html/htmlnum.cxx | 14 +-- sw/source/filter/html/htmlnum.hxx | 66 +++++------ sw/source/filter/inc/fltshell.hxx | 26 ++--- sw/source/filter/inc/msfilter.hxx | 2 +- sw/source/filter/ww8/writerhelper.cxx | 10 +- sw/source/filter/ww8/ww8graf.cxx | 4 +- sw/source/filter/ww8/ww8par.cxx | 26 ++--- sw/source/filter/ww8/ww8par5.cxx | 2 +- sw/source/filter/ww8/ww8par6.cxx | 10 +- 11 files changed, 222 insertions(+), 226 deletions(-) (limited to 'sw') diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index f2c6c8c7eac4..e81bcec11df4 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -78,15 +78,15 @@ static OUString lcl_getTypePath(OUString& rType) SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos, std::unique_ptr pHt) : m_aMkPos(rStartPos) , m_aPtPos(rStartPos) - , pAttr( std::move(pHt) ) + , m_pAttr( std::move(pHt) ) , m_isAnnotationOnEnd(false) , mnStartCP(-1) , mnEndCP(-1) - , bIsParaEnd(false) + , m_bIsParaEnd(false) { - bOld = false; // used for marking Attributes *before* skipping field results - bOpen = true; // lock the attribute --> may first - bConsumedByField = false; + m_bOld = false; // used for marking Attributes *before* skipping field results + m_bOpen = true; // lock the attribute --> may first + m_bConsumedByField = false; } SwFltStackEntry::~SwFltStackEntry() @@ -100,7 +100,7 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos) // Everything with sal_uInt16s, lest the inserting of new text at // the cursor position moves the attribute's range // That's not the desired behavior! - bOpen = false; // release and remember END + m_bOpen = false; // release and remember END m_aPtPos.FromSwPosition(rEndPos); } @@ -168,8 +168,8 @@ bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode const e bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode eCheck) const { - return MakeRegion(rDoc, rRegion, eCheck, m_aMkPos, m_aPtPos, bIsParaEnd, - pAttr->Which()); + return MakeRegion(rDoc, rRegion, eCheck, m_aMkPos, m_aPtPos, m_bIsParaEnd, + m_pAttr->Which()); } SwFltControlStack::SwFltControlStack(SwDoc& rDo, sal_uLong nFieldFl) @@ -218,7 +218,7 @@ void SwFltControlStack::MoveAttrs(const SwPosition& rPos, MoveAttrsMode eMode) assert(!(rEntry.m_isAnnotationOnEnd && rEntry.m_aPtPos.m_nContent > nPosCt)); if ( eMode == MoveAttrsMode::POSTIT_INSERTED && rEntry.m_aPtPos.m_nContent == nPosCt - && rEntry.pAttr->Which() == RES_FLTR_ANNOTATIONMARK) + && rEntry.m_pAttr->Which() == RES_FLTR_ANNOTATIONMARK) { rEntry.m_isAnnotationOnEnd = true; eMode = MoveAttrsMode::DEFAULT; // only set 1 flag @@ -236,7 +236,7 @@ void SwFltControlStack::MarkAllAttrsOld() { size_t nCnt = m_Entries.size(); for (size_t i=0; i < nCnt; ++i) - m_Entries[i]->bOld = true; + m_Entries[i]->m_bOld = true; } namespace @@ -245,12 +245,12 @@ namespace const SfxPoolItem& rAttr) { return (pExtendCandidate && - !pExtendCandidate->bConsumedByField && + !pExtendCandidate->m_bConsumedByField && //if we bring character attributes into the fold we need to both //a) consider RES_CHRATR_FONTSIZE and RES_CHRATR_FONT wrt Word's CJK/CTL variants //b) consider crossing table cell boundaries (tdf#102334) isPARATR_LIST(rAttr.Which()) && - *(pExtendCandidate->pAttr) == rAttr); + *(pExtendCandidate->m_pAttr) == rAttr); } } @@ -270,7 +270,7 @@ void SwFltControlStack::NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr //from. If so we merge it with this one and elide adding another //to the stack pExtendCandidate->SetEndPos(rPos); - pExtendCandidate->bOpen=true; + pExtendCandidate->m_bOpen=true; } else { @@ -331,8 +331,8 @@ void SwFltControlStack::KillUnlockedAttrs(const SwPosition& rPos) { nCnt --; SwFltStackEntry& rEntry = *m_Entries[nCnt]; - if( !rEntry.bOld - && !rEntry.bOpen + if( !rEntry.m_bOld + && !rEntry.m_bOpen && (rEntry.m_aMkPos == aFltPos) && (rEntry.m_aPtPos == aFltPos)) { @@ -363,7 +363,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos, bool bLastEntry = aI == m_Entries.end() - 1; SwFltStackEntry& rEntry = **aI; - if (rEntry.bOpen) + if (rEntry.m_bOpen) { // set end of attribute bool bF = false; @@ -371,32 +371,32 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos, { bF = true; } - else if (nAttrId == rEntry.pAttr->Which()) + else if (nAttrId == rEntry.m_pAttr->Which()) { if( nAttrId != RES_FLTR_BOOKMARK && nAttrId != RES_FLTR_ANNOTATIONMARK && nAttrId != RES_FLTR_RDFMARK ) { // query handle bF = true; } - else if (nAttrId == RES_FLTR_BOOKMARK && nHand == static_cast(rEntry.pAttr.get())->GetHandle()) + else if (nAttrId == RES_FLTR_BOOKMARK && nHand == static_cast(rEntry.m_pAttr.get())->GetHandle()) { bF = true; } - else if (nAttrId == RES_FLTR_ANNOTATIONMARK && nHand == static_cast(rEntry.pAttr.get())->GetValue()) + else if (nAttrId == RES_FLTR_ANNOTATIONMARK && nHand == static_cast(rEntry.m_pAttr.get())->GetValue()) { bF = true; } - else if (nAttrId == RES_FLTR_RDFMARK && nHand == static_cast(rEntry.pAttr.get())->GetHandle()) + else if (nAttrId == RES_FLTR_RDFMARK && nHand == static_cast(rEntry.m_pAttr.get())->GetHandle()) { bF = true; } } if (bF) { - rEntry.bConsumedByField = consumedByField; + rEntry.m_bConsumedByField = consumedByField; rEntry.SetEndPos(rPos); rEntry.SetEndCP(GetCurrAttrCP()); - if (bLastEntry && nAttrId == rEntry.pAttr->Which()) + if (bLastEntry && nAttrId == rEntry.m_pAttr->Which()) { //potential candidate for merging with an identical //property beginning at rPos @@ -423,7 +423,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const SwPosition& rPos, //we advance to the next node, or finish processing the document if (rEntry.m_aPtPos.m_nNode.GetIndex() == aFltPos.m_nNode.GetIndex()) { - if (bLastEntry && nAttrId == rEntry.pAttr->Which() && + if (bLastEntry && nAttrId == rEntry.m_pAttr->Which() && rEntry.m_aPtPos.m_nContent == aFltPos.m_nContent) { //potential candidate for merging with an identical @@ -533,11 +533,11 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, { SwPaM aRegion( rTmpPos ); - switch(rEntry.pAttr->Which()) + switch(rEntry.m_pAttr->Which()) { case RES_FLTR_ANCHOR: { - SwFrameFormat* pFormat = static_cast(rEntry.pAttr.get())->GetFrameFormat(); + SwFrameFormat* pFormat = static_cast(rEntry.m_pAttr.get())->GetFrameFormat(); if (pFormat != nullptr) { MakePoint(rEntry, m_rDoc, aRegion); @@ -565,7 +565,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, case RES_FLTR_NUMRULE: // insert Numrule { - const OUString& rNumNm = static_cast(rEntry.pAttr.get())->GetValue(); + const OUString& rNumNm = static_cast(rEntry.m_pAttr.get())->GetValue(); SwNumRule* pNumRule = m_rDoc.FindNumRulePtr( rNumNm ); if( pNumRule ) { @@ -593,8 +593,8 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, case RES_FLTR_BOOKMARK: { - SwFltBookmark* pB = static_cast(rEntry.pAttr.get()); - const OUString& rName = static_cast(rEntry.pAttr.get())->GetName(); + SwFltBookmark* pB = static_cast(rEntry.m_pAttr.get()); + const OUString& rName = static_cast(rEntry.m_pAttr.get())->GetName(); if (IsFlagSet(BOOK_TO_VAR_REF)) { @@ -611,7 +611,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, MoveAttrs( *(aRegion.GetPoint()) ); } if ( ( !IsFlagSet(HYPO) || IsFlagSet(BOOK_AND_REF) ) && - !rEntry.bConsumedByField ) + !rEntry.m_bConsumedByField ) { MakeBookRegionOrPoint(rEntry, m_rDoc, aRegion); // #i120879# - create a cross reference heading bookmark if appropriate. @@ -670,7 +670,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, { if (MakeBookRegionOrPoint(rEntry, m_rDoc, aRegion)) { - SwFltRDFMark* pMark = static_cast(rEntry.pAttr.get()); + SwFltRDFMark* pMark = static_cast(rEntry.m_pAttr.get()); if (aRegion.GetNode().IsTextNode()) { SwTextNode& rTextNode = *aRegion.GetNode().GetTextNode(); @@ -696,7 +696,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwPosition* pPoint = aRegion.GetPoint(); - SwFltTOX* pTOXAttr = static_cast(rEntry.pAttr.get()); + SwFltTOX* pTOXAttr = static_cast(rEntry.m_pAttr.get()); // test if on this node there had been a pagebreak BEFORE the // tox attribute was put on the stack @@ -740,7 +740,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags( RedlineFlags::On | RedlineFlags::ShowInsert | RedlineFlags::ShowDelete ); - SwFltRedline& rFltRedline = *static_cast(rEntry.pAttr.get()); + SwFltRedline& rFltRedline = *static_cast(rEntry.m_pAttr.get()); SwRedlineData aData(rFltRedline.m_eType, rFltRedline.m_nAutorNo, @@ -773,11 +773,11 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, { if (rEntry.IsParaEnd()) { - m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr, SetAttrMode::DEFAULT, nullptr, true); + m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.m_pAttr, SetAttrMode::DEFAULT, nullptr, true); } else { - m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr); + m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.m_pAttr); } } } @@ -804,11 +804,11 @@ SfxPoolItem* SwFltControlStack::GetFormatStackAttr(sal_uInt16 nWhich, sal_uInt16 // is it the looked-for attribute ? (only applies to locked, meaning // currently set attributes!!) SwFltStackEntry &rEntry = *m_Entries[--nSize]; - if (rEntry.bOpen && rEntry.pAttr->Which() == nWhich) + if (rEntry.m_bOpen && rEntry.m_pAttr->Which() == nWhich) { if (pPos) *pPos = nSize; - return rEntry.pAttr.get(); // Ok, so stop + return rEntry.m_pAttr.get(); // Ok, so stop } } return nullptr; @@ -823,9 +823,9 @@ const SfxPoolItem* SwFltControlStack::GetOpenStackAttr(const SwPosition& rPos, s while (nSize) { SwFltStackEntry &rEntry = *m_Entries[--nSize]; - if (rEntry.bOpen && rEntry.pAttr->Which() == nWhich && rEntry.m_aMkPos == aFltPos) + if (rEntry.m_bOpen && rEntry.m_pAttr->Which() == nWhich && rEntry.m_aMkPos == aFltPos) { - return rEntry.pAttr.get(); + return rEntry.m_pAttr.get(); } } return nullptr; @@ -862,7 +862,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam) bool bEntryEndAfterSelStart = false; bool bEntryEndBeforeSelEnd = false; - if (!rEntry.bOpen) + if (!rEntry.m_bOpen) { bEntryEndAfterSelStart = (rEntry.m_aPtPos.m_nNode == aStartNode && @@ -912,7 +912,7 @@ void SwFltControlStack::Delete(const SwPaM &rPam) } //That's what Open is, end equal to start, and nPtContent is invalid - if (rEntry.bOpen) + if (rEntry.m_bOpen) rEntry.m_aPtPos = rEntry.m_aMkPos; } } @@ -1068,7 +1068,7 @@ const std::vector< std::pair >& SwFltRDFMark::GetAttributes( // methods of SwFltTOX follow SwFltTOX::SwFltTOX(std::shared_ptr xBase) : SfxPoolItem(RES_FLTR_TOX), m_xTOXBase(std::move(xBase)), - bHadBreakItem( false ), bHadPageDescItem( false ) + m_bHadBreakItem( false ), m_bHadPageDescItem( false ) { } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index f6a169d36fa9..b3d56597ebf7 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -1071,22 +1071,22 @@ enum HTMLOnOffState { HTML_NOT_SUPPORTED, // unsupported Attribute class HTMLEndPosLst { - HTMLStartEndPositions aStartLst; // list, sorted for start positions - HTMLStartEndPositions aEndLst; // list, sorted for end positions - std::deque aScriptChgLst; // positions where script changes - // 0 is not contained in this list, - // but the text length + HTMLStartEndPositions m_aStartLst; // list, sorted for start positions + HTMLStartEndPositions m_aEndLst; // list, sorted for end positions + std::deque m_aScriptChgLst; // positions where script changes + // 0 is not contained in this list, + // but the text length // the script that is valid up to the position // contained in aScriptChgList at the same index - std::vector aScriptLst; + std::vector m_aScriptLst; - SwDoc *pDoc; // the current document - SwDoc* pTemplate; // the HTML template (or 0) - std::optional xDfltColor;// the default foreground colors - std::set& rScriptTextStyles; + SwDoc* m_pDoc; // the current document + SwDoc* m_pTemplate; // the HTML template (or 0) + std::optional m_xDefaultColor; // the default foreground colors + std::set& m_rScriptTextStyles; - sal_uLong nHTMLMode; - bool bOutStyles : 1; // are styles exported + sal_uLong m_nHTMLMode; + bool m_bOutStyles : 1; // are styles exported // Insert/remove a SttEndPos in/from the Start and End lists. // The end position is known. @@ -1148,7 +1148,7 @@ public: void OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, HTMLOutContext *pContext ); - bool IsHTMLMode( sal_uLong nMode ) const { return (nHTMLMode & nMode) != 0; } + bool IsHTMLMode(sal_uLong nMode) const { return (m_nHTMLMode & nMode) != 0; } }; } @@ -1160,26 +1160,25 @@ void HTMLEndPosLst::InsertItem_( HTMLStartEndPos *pPos, HTMLStartEndPositions::s sal_Int32 nStart = pPos->GetStart(); HTMLStartEndPositions::size_type i {0}; - while( i < aStartLst.size() && aStartLst[i]->GetStart() <= nStart ) + while (i < m_aStartLst.size() && m_aStartLst[i]->GetStart() <= nStart) ++i; - aStartLst.insert( aStartLst.begin() + i, pPos ); + m_aStartLst.insert(m_aStartLst.begin() + i, pPos); // the position in the End list was supplied - aEndLst.insert( aEndLst.begin() + nEndPos, pPos ); + m_aEndLst.insert(m_aEndLst.begin() + nEndPos, pPos); } void HTMLEndPosLst::RemoveItem_( HTMLStartEndPositions::size_type nEndPos ) { - HTMLStartEndPos *pPos = aEndLst[nEndPos]; + HTMLStartEndPos* pPos = m_aEndLst[nEndPos]; // now, we are looking for it in the Start list - HTMLStartEndPositions::iterator it = - std::find(aStartLst.begin(), aStartLst.end(), pPos ); - OSL_ENSURE(it != aStartLst.end(), "Item not found in Start List!"); - if( it != aStartLst.end() ) - aStartLst.erase( it ); + HTMLStartEndPositions::iterator it = std::find(m_aStartLst.begin(), m_aStartLst.end(), pPos); + OSL_ENSURE(it != m_aStartLst.end(), "Item not found in Start List!"); + if (it != m_aStartLst.end()) + m_aStartLst.erase(it); - aEndLst.erase( aEndLst.begin() + nEndPos ); + m_aEndLst.erase(m_aEndLst.begin() + nEndPos); delete pPos; } @@ -1335,7 +1334,7 @@ HTMLOnOffState HTMLEndPosLst::GetHTMLItemState( const SfxPoolItem& rItem ) bool HTMLEndPosLst::ExistsOnTagItem( sal_uInt16 nWhich, sal_Int32 nPos ) { - for( auto pTest : aStartLst ) + for (auto pTest : m_aStartLst) { if( pTest->GetStart() > nPos ) { @@ -1369,7 +1368,7 @@ bool HTMLEndPosLst::ExistsOffTagItem( sal_uInt16 nWhich, sal_Int32 nStartPos, return false; } - for( auto pTest : aStartLst ) + for (auto pTest : m_aStartLst) { if( pTest->GetStart() > nStartPos ) { @@ -1405,22 +1404,21 @@ void HTMLEndPosLst::FixSplittedItem( HTMLStartEndPos *pPos, sal_Int32 nNewEnd, pPos->SetEnd( nNewEnd ); // remove the item from the End list - HTMLStartEndPositions::iterator it = - std::find(aEndLst.begin(), aEndLst.end(), pPos ); - OSL_ENSURE(it != aEndLst.end(), "Item not found in End List!" ); - if( it != aEndLst.end() ) - aEndLst.erase( it ); + HTMLStartEndPositions::iterator it = std::find(m_aEndLst.begin(), m_aEndLst.end(), pPos); + OSL_ENSURE(it != m_aEndLst.end(), "Item not found in End List!"); + if (it != m_aEndLst.end()) + m_aEndLst.erase(it); // from now on, it is closed as the last one at the corresponding position HTMLStartEndPositions::size_type nEndPos {0}; - while( nEndPos < aEndLst.size() && aEndLst[nEndPos]->GetEnd() <= nNewEnd ) + while (nEndPos < m_aEndLst.size() && m_aEndLst[nEndPos]->GetEnd() <= nNewEnd) ++nEndPos; - aEndLst.insert( aEndLst.begin() + nEndPos, pPos ); + m_aEndLst.insert(m_aEndLst.begin() + nEndPos, pPos); // now, adjust the attributes that got started afterwards - for( HTMLStartEndPositions::size_type i = nStartPos+1; iGetEnd(); if( pTest->GetStart() >= nNewEnd ) { @@ -1437,14 +1435,14 @@ void HTMLEndPosLst::FixSplittedItem( HTMLStartEndPos *pPos, sal_Int32 nNewEnd, pTest->SetEnd( nNewEnd ); // remove the attribute from the End list - it = std::find(aEndLst.begin(), aEndLst.end(), pTest ); - OSL_ENSURE(it != aEndLst.end(), "Item not found in End List!" ); - if( it != aEndLst.end() ) - aEndLst.erase( it ); + it = std::find(m_aEndLst.begin(), m_aEndLst.end(), pTest); + OSL_ENSURE(it != m_aEndLst.end(), "Item not found in End List!"); + if (it != m_aEndLst.end()) + m_aEndLst.erase(it); // it now ends as the first attribute in the respective position. // We already know this position in the End list. - aEndLst.insert( aEndLst.begin() + nEndPos, pTest ); + m_aEndLst.insert(m_aEndLst.begin() + nEndPos, pTest); // insert the 'rest' of the attribute InsertItem( *pTest->GetItem(), nNewEnd, nTestEnd ); @@ -1456,9 +1454,9 @@ void HTMLEndPosLst::InsertItem( const SfxPoolItem& rItem, sal_Int32 nStart, sal_Int32 nEnd ) { HTMLStartEndPositions::size_type i; - for( i = 0; i < aEndLst.size(); i++ ) + for (i = 0; i < m_aEndLst.size(); i++) { - HTMLStartEndPos *pTest = aEndLst[i]; + HTMLStartEndPos* pTest = m_aEndLst[i]; sal_Int32 nTestEnd = pTest->GetEnd(); if( nTestEnd <= nStart ) { @@ -1495,9 +1493,9 @@ void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart, // first, we must search for the old items by using the start list and // determine the new item range - for( HTMLStartEndPositions::size_type i=0; iGetStart(); sal_Int32 nTestEnd = pTest->GetEnd(); @@ -1528,14 +1526,14 @@ void HTMLEndPosLst::SplitItem( const SfxPoolItem& rItem, sal_Int32 nStart, { // the Test item only starts after the new end of the // attribute. Therefore, it can be completely erased. - aStartLst.erase( aStartLst.begin() + i ); + m_aStartLst.erase(m_aStartLst.begin() + i); i--; - HTMLStartEndPositions::iterator it = - std::find(aEndLst.begin(), aEndLst.end(), pTest ); - OSL_ENSURE(it != aEndLst.end(), "Item not found in End List!" ); - if( it != aEndLst.end() ) - aEndLst.erase( it ); + HTMLStartEndPositions::iterator it + = std::find(m_aEndLst.begin(), m_aEndLst.end(), pTest); + OSL_ENSURE(it != m_aEndLst.end(), "Item not found in End List!"); + if (it != m_aEndLst.end()) + m_aEndLst.erase(it); } // if necessary, insert the second part of the split @@ -1564,25 +1562,23 @@ const SwHTMLFormatInfo *HTMLEndPosLst::GetFormatInfo( const SwFormat& rFormat, } else { - pFormatInfo = new SwHTMLFormatInfo( &rFormat, pDoc, pTemplate, - bOutStyles ); + pFormatInfo = new SwHTMLFormatInfo(&rFormat, m_pDoc, m_pTemplate, m_bOutStyles); rFormatInfos.insert(std::unique_ptr(pFormatInfo)); - if ( rScriptTextStyles.count( rFormat.GetName() ) ) + if (m_rScriptTextStyles.count(rFormat.GetName())) pFormatInfo->bScriptDependent = true; } return pFormatInfo; } -HTMLEndPosLst::HTMLEndPosLst(SwDoc* pD, SwDoc* pTempl, std::optional xDfltCol, - bool bStyles, sal_uLong nMode, const OUString& rText, - std::set& rStyles) - : pDoc(pD) - , pTemplate(pTempl) - , xDfltColor(std::move(xDfltCol)) - , rScriptTextStyles(rStyles) - , nHTMLMode(nMode) - , bOutStyles(bStyles) +HTMLEndPosLst::HTMLEndPosLst(SwDoc* pD, SwDoc* pTempl, std::optional xDfltCol, bool bStyles, + sal_uLong nMode, const OUString& rText, std::set& rStyles) + : m_pDoc(pD) + , m_pTemplate(pTempl) + , m_xDefaultColor(std::move(xDfltCol)) + , m_rScriptTextStyles(rStyles) + , m_nHTMLMode(nMode) + , m_bOutStyles(bStyles) { sal_Int32 nEndPos = rText.getLength(); sal_Int32 nPos = 0; @@ -1590,15 +1586,15 @@ HTMLEndPosLst::HTMLEndPosLst(SwDoc* pD, SwDoc* pTempl, std::optional xDfl { sal_uInt16 nScript = g_pBreakIt->GetBreakIter()->getScriptType( rText, nPos ); nPos = g_pBreakIt->GetBreakIter()->endOfScript( rText, nPos, nScript ); - aScriptChgLst.push_back( nPos ); - aScriptLst.push_back( nScript ); + m_aScriptChgLst.push_back(nPos); + m_aScriptLst.push_back(nScript); } } HTMLEndPosLst::~HTMLEndPosLst() { - OSL_ENSURE(aStartLst.empty(), "Start List not empty in destructor"); - OSL_ENSURE(aEndLst.empty(), "End List not empty in destructor"); + OSL_ENSURE(m_aStartLst.empty(), "Start List not empty in destructor"); + OSL_ENSURE(m_aEndLst.empty(), "End List not empty in destructor"); } void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem, @@ -1625,8 +1621,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem, // together with the paragraph tag. if( ExistsOnTagItem( rItem.Which(), nStart ) ) bSplit = true; - bSet = bOutStyles && !bParaAttrs && - !ExistsOffTagItem( rItem.Which(), nStart, nEnd ); + bSet = m_bOutStyles && !bParaAttrs && !ExistsOffTagItem(rItem.Which(), nStart, nEnd); break; case HTML_REAL_VALUE: @@ -1639,11 +1634,9 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem, // the paragraph, it was already output with the paragraph tag. // The only exception is the character-background attribute. This // attribute must always be handled like a Hint. - bSet = bOutStyles && - (!bParaAttrs - || rItem.Which()==RES_CHRATR_BACKGROUND - || rItem.Which()==RES_CHRATR_BOX - || rItem.Which()==RES_CHRATR_OVERLINE); + bSet = m_bOutStyles + && (!bParaAttrs || rItem.Which() == RES_CHRATR_BACKGROUND + || rItem.Which() == RES_CHRATR_BOX || rItem.Which() == RES_CHRATR_OVERLINE); break; case HTML_CHRFMT_VALUE: @@ -1686,8 +1679,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem, Color aColor( static_cast(rItem).GetValue() ); if( COL_AUTO == aColor ) aColor = COL_BLACK; - bSet = !bParaAttrs || !xDfltColor || - !xDfltColor->IsRGBEqual( aColor ); + bSet = !bParaAttrs || !m_xDefaultColor || !m_xDefaultColor->IsRGBEqual(aColor); } break; @@ -1697,7 +1689,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem, "Not a drop cap, after all" ); const SwFormatDrop& rDrop = static_cast(rItem); nEnd = nStart + rDrop.GetChars(); - if( !bOutStyles ) + if (!m_bOutStyles) { // At least use the attributes of the character style const SwCharFormat *pCharFormat = rDrop.GetCharFormat(); @@ -1771,10 +1763,14 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem, break; case RES_TXTATR_INETFMT: { - if( GetFormatInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( - RES_POOLCHR_INET_NORMAL), rFormatInfos )->bScriptDependent || - GetFormatInfo( *pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( - RES_POOLCHR_INET_VISIT), rFormatInfos )->bScriptDependent ) + if (GetFormatInfo(*m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( + RES_POOLCHR_INET_NORMAL), + rFormatInfos) + ->bScriptDependent + || GetFormatInfo(*m_pDoc->getIDocumentStylePoolAccess().GetCharFormatFromPool( + RES_POOLCHR_INET_VISIT), + rFormatInfos) + ->bScriptDependent) { bDependsOnScript = true; bDependsOnAnyScript = true; @@ -1786,9 +1782,9 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem, if( bDependsOnScript ) { sal_Int32 nPos = nStart; - for( size_t i=0; i < aScriptChgLst.size(); i++ ) + for (size_t i = 0; i < m_aScriptChgLst.size(); i++) { - sal_Int32 nChgPos = aScriptChgLst[i]; + sal_Int32 nChgPos = m_aScriptChgLst[i]; if( nPos >= nChgPos ) { // the hint starts behind or at the next script change, @@ -1800,7 +1796,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem, // the (rest of) the hint ends before or at the next script // change, so we can insert it, but only if it belongs // to the current script. - if( bDependsOnAnyScript || nScript == aScriptLst[i] ) + if (bDependsOnAnyScript || nScript == m_aScriptLst[i]) InsertNoScript( rItem, nPos, nEnd, rFormatInfos, bParaAttrs ); break; @@ -1809,7 +1805,7 @@ void HTMLEndPosLst::Insert( const SfxPoolItem& rItem, // the hint starts before the next script change and ends behind // it, so we can insert a hint up to the next script change and // continue with the rest of the hint. - if( bDependsOnAnyScript || nScript == aScriptLst[i] ) + if (bDependsOnAnyScript || nScript == m_aScriptLst[i]) InsertNoScript( rItem, nPos, nChgPos, rFormatInfos, bParaAttrs ); nPos = nChgPos; } @@ -1855,27 +1851,27 @@ void HTMLEndPosLst::Insert( const SwDrawFrameFormat& rFormat, sal_Int32 nPos, SfxItemSet aItemSet( *rFormatItemSet.GetPool(), svl::Items{} ); SwHTMLWriter::GetEEAttrsFromDrwObj( aItemSet, pTextObj ); - bool bOutStylesOld = bOutStyles; - bOutStyles = false; + bool bOutStylesOld = m_bOutStyles; + m_bOutStyles = false; Insert( aItemSet, nPos, nPos+1, rFormatInfos, false ); - bOutStyles = bOutStylesOld; + m_bOutStyles = bOutStylesOld; } sal_uInt16 HTMLEndPosLst::GetScriptAtPos( sal_Int32 nPos, sal_uInt16 nWeak ) { sal_uInt16 nRet = CSS1_OUTMODE_ANY_SCRIPT; - size_t nScriptChgs = aScriptChgLst.size(); + size_t nScriptChgs = m_aScriptChgLst.size(); size_t i=0; - while( i < nScriptChgs && nPos >= aScriptChgLst[i] ) + while (i < nScriptChgs && nPos >= m_aScriptChgLst[i]) i++; OSL_ENSURE( i < nScriptChgs, "script list is too short" ); if( i < nScriptChgs ) { - if( i18n::ScriptType::WEAK == aScriptLst[i] ) + if (i18n::ScriptType::WEAK == m_aScriptLst[i]) nRet = nWeak; else - nRet = SwHTMLWriter::GetCSS1ScriptForScriptType( aScriptLst[i] ); + nRet = SwHTMLWriter::GetCSS1ScriptForScriptType(m_aScriptLst[i]); } return nRet; @@ -1889,27 +1885,27 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, // Character border attribute must be the first which is written out // because of border merge. HTMLStartEndPositions::size_type nCharBoxIndex = 0; - while( nCharBoxIndex < aStartLst.size() && - aStartLst[nCharBoxIndex]->GetItem()->Which() != RES_CHRATR_BOX ) + while (nCharBoxIndex < m_aStartLst.size() + && m_aStartLst[nCharBoxIndex]->GetItem()->Which() != RES_CHRATR_BOX) { ++nCharBoxIndex; } // the attributes of the start list are sorted in ascending order - for( HTMLStartEndPositions::size_type i=0; i< aStartLst.size(); ++i ) + for (HTMLStartEndPositions::size_type i = 0; i < m_aStartLst.size(); ++i) { HTMLStartEndPos *pPos = nullptr; - if( nCharBoxIndex < aStartLst.size() ) + if (nCharBoxIndex < m_aStartLst.size()) { if( i == 0 ) - pPos = aStartLst[nCharBoxIndex]; + pPos = m_aStartLst[nCharBoxIndex]; else if( i == nCharBoxIndex ) - pPos = aStartLst[0]; + pPos = m_aStartLst[0]; else - pPos = aStartLst[i]; + pPos = m_aStartLst[i]; } else - pPos = aStartLst[i]; + pPos = m_aStartLst[i]; sal_Int32 nStart = pPos->GetStart(); if( nStart > nPos ) @@ -1947,9 +1943,9 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, // the attributes in the End list are sorted in ascending order HTMLStartEndPositions::size_type i {0}; - while( i < aEndLst.size() ) + while (i < m_aEndLst.size()) { - HTMLStartEndPos *pPos = aEndLst[i]; + HTMLStartEndPos* pPos = m_aEndLst[i]; sal_Int32 nEnd = pPos->GetEnd(); if( SAL_MAX_INT32 == nPos || nEnd == nPos ) @@ -1963,12 +1959,12 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, bool bSkipOut = false; if( pPos->GetItem()->Which() == RES_CHRATR_BOX ) { - HTMLStartEndPositions::iterator it = - std::find(aStartLst.begin(), aStartLst.end(), pPos ); - OSL_ENSURE(it != aStartLst.end(), "Item not found in Start List!" ); - if (it != aStartLst.end()) + HTMLStartEndPositions::iterator it + = std::find(m_aStartLst.begin(), m_aStartLst.end(), pPos); + OSL_ENSURE(it != m_aStartLst.end(), "Item not found in Start List!"); + if (it != m_aStartLst.end()) ++it; - while(it != aStartLst.end() ) + while (it != m_aStartLst.end()) { HTMLStartEndPos *pEndPos = *it; if( pEndPos->GetItem()->Which() == RES_CHRATR_BOX && diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx index 2fdb68e7ae58..bd8317bb5676 100644 --- a/sw/source/filter/html/htmlnum.cxx +++ b/sw/source/filter/html/htmlnum.cxx @@ -26,21 +26,21 @@ void SwHTMLNumRuleInfo::Set(const SwTextNode& rTextNd) const SwNumRule* pTextNdNumRule(rTextNd.GetNumRule()); if (pTextNdNumRule && pTextNdNumRule != rTextNd.GetDoc().GetOutlineNumRule()) { - pNumRule = const_cast(pTextNdNumRule); - nDeep = o3tl::narrowing(pNumRule ? rTextNd.GetActualListLevel() + 1 : 0); - bNumbered = rTextNd.IsCountedInList(); + m_pNumRule = const_cast(pTextNdNumRule); + m_nDeep = o3tl::narrowing(m_pNumRule ? rTextNd.GetActualListLevel() + 1 : 0); + m_bNumbered = rTextNd.IsCountedInList(); // #i57919# - correction of refactoring done by cws swnumtree: // has to be set to , if numbering is restarted at this // text node and the start value equals . // Start value indicates, that at this text node the numbering // is restarted with the value given at the corresponding level. - bRestart = rTextNd.IsListRestart() && !rTextNd.HasAttrListRestartValue(); + m_bRestart = rTextNd.IsListRestart() && !rTextNd.HasAttrListRestartValue(); } else { - pNumRule = nullptr; - nDeep = 0; - bNumbered = bRestart = false; + m_pNumRule = nullptr; + m_nDeep = 0; + m_bNumbered = m_bRestart = false; } } diff --git a/sw/source/filter/html/htmlnum.hxx b/sw/source/filter/html/htmlnum.hxx index 917c0514a259..2e7957996509 100644 --- a/sw/source/filter/html/htmlnum.hxx +++ b/sw/source/filter/html/htmlnum.hxx @@ -35,11 +35,11 @@ class SwNumRule; class SwHTMLNumRuleInfo { - sal_uInt16 aNumStarts[MAXLEVEL]; - SwNumRule * pNumRule; // current numbering - sal_uInt16 nDeep; // current numbering depth (1, 2, 3, ...) - bool bRestart : 1; // Export: restart numbering - bool bNumbered : 1; // Export: paragraph is numbered + sal_uInt16 m_aNumStarts[MAXLEVEL]; + SwNumRule * m_pNumRule; // current numbering + sal_uInt16 m_nDeep; // current numbering depth (1, 2, 3, ...) + bool m_bRestart : 1; // Export: restart numbering + bool m_bNumbered : 1; // Export: paragraph is numbered public: @@ -47,17 +47,17 @@ public: void Set( const SwTextNode& rTextNd ); SwHTMLNumRuleInfo() : - pNumRule( nullptr ), nDeep( 0 ), - bRestart( false ), bNumbered( false ) + m_pNumRule( nullptr ), m_nDeep( 0 ), + m_bRestart( false ), m_bNumbered( false ) { - memset( &aNumStarts, 0xff, sizeof( aNumStarts ) ); + memset( &m_aNumStarts, 0xff, sizeof( m_aNumStarts ) ); } SwHTMLNumRuleInfo( const SwHTMLNumRuleInfo& rInf ) : - pNumRule( rInf.pNumRule ), nDeep( rInf.nDeep ), - bRestart( rInf.bRestart ), bNumbered( rInf.bNumbered ) + m_pNumRule( rInf.m_pNumRule ), m_nDeep( rInf.m_nDeep ), + m_bRestart( rInf.m_bRestart ), m_bNumbered( rInf.m_bNumbered ) { - memcpy( &aNumStarts, &rInf.aNumStarts, sizeof( aNumStarts ) ); + memcpy( &m_aNumStarts, &rInf.m_aNumStarts, sizeof( m_aNumStarts ) ); } explicit SwHTMLNumRuleInfo( const SwTextNode& rTextNd ) { Set( rTextNd ); } @@ -65,22 +65,22 @@ public: inline void Clear(); - void SetNumRule( const SwNumRule *pRule ) { pNumRule = const_cast(pRule); } - SwNumRule *GetNumRule() { return pNumRule; } - const SwNumRule *GetNumRule() const { return pNumRule; } + void SetNumRule( const SwNumRule *pRule ) { m_pNumRule = const_cast(pRule); } + SwNumRule *GetNumRule() { return m_pNumRule; } + const SwNumRule *GetNumRule() const { return m_pNumRule; } - void SetDepth( sal_uInt16 nDepth ) { nDeep = nDepth; } - sal_uInt16 GetDepth() const { return nDeep; } - void IncDepth() { ++nDeep; } - void DecDepth() { if (nDeep!=0) --nDeep; } + void SetDepth( sal_uInt16 nDepth ) { m_nDeep = nDepth; } + sal_uInt16 GetDepth() const { return m_nDeep; } + void IncDepth() { ++m_nDeep; } + void DecDepth() { if (m_nDeep!=0) --m_nDeep; } inline sal_uInt8 GetLevel() const; - bool IsRestart() const { return bRestart; } + bool IsRestart() const { return m_bRestart; } - bool IsNumbered() const { return bNumbered; } + bool IsNumbered() const { return m_bNumbered; } inline void SetNodeStartValue( sal_uInt8 nLvl, sal_uInt16 nVal=USHRT_MAX ); - sal_uInt16 GetNodeStartValue( sal_uInt8 nLvl ) const { return aNumStarts[nLvl]; } + sal_uInt16 GetNodeStartValue( sal_uInt8 nLvl ) const { return m_aNumStarts[nLvl]; } }; inline SwHTMLNumRuleInfo& SwHTMLNumRuleInfo::operator=( @@ -92,32 +92,32 @@ inline SwHTMLNumRuleInfo& SwHTMLNumRuleInfo::operator=( inline void SwHTMLNumRuleInfo::Set( const SwHTMLNumRuleInfo& rInf ) { - pNumRule = rInf.pNumRule; - nDeep = rInf.nDeep; - bRestart = rInf.bRestart; - bNumbered = rInf.bNumbered; - memcpy( &aNumStarts, &rInf.aNumStarts, sizeof( aNumStarts ) ); + m_pNumRule = rInf.m_pNumRule; + m_nDeep = rInf.m_nDeep; + m_bRestart = rInf.m_bRestart; + m_bNumbered = rInf.m_bNumbered; + memcpy( &m_aNumStarts, &rInf.m_aNumStarts, sizeof( m_aNumStarts ) ); } inline void SwHTMLNumRuleInfo::Clear() { - pNumRule = nullptr; - nDeep = 0; - bRestart = bNumbered = false; - memset( &aNumStarts, 0xff, sizeof( aNumStarts ) ); + m_pNumRule = nullptr; + m_nDeep = 0; + m_bRestart = m_bNumbered = false; + memset( &m_aNumStarts, 0xff, sizeof( m_aNumStarts ) ); } inline sal_uInt8 SwHTMLNumRuleInfo::GetLevel() const { return - static_cast( pNumRule!=nullptr && nDeep != 0 - ? ( nDeep<=MAXLEVEL ? nDeep-1 : MAXLEVEL - 1 ) + static_cast( m_pNumRule!=nullptr && m_nDeep != 0 + ? ( m_nDeep<=MAXLEVEL ? m_nDeep-1 : MAXLEVEL - 1 ) : 0 ); } inline void SwHTMLNumRuleInfo::SetNodeStartValue( sal_uInt8 nLvl, sal_uInt16 nVal ) { - aNumStarts[nLvl] = nVal; + m_aNumStarts[nLvl] = nVal; } #endif diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx index e30f54822f8d..d83349558b67 100644 --- a/sw/source/filter/inc/fltshell.hxx +++ b/sw/source/filter/inc/fltshell.hxx @@ -87,16 +87,16 @@ public: SwFltPosition m_aMkPos; SwFltPosition m_aPtPos; - std::unique_ptr pAttr;// Format Attribute + std::unique_ptr m_pAttr;// Format Attribute - bool bOld; // to mark Attributes *before* skipping field results - bool bOpen; //Entry open, awaiting being closed - bool bConsumedByField; + bool m_bOld; // to mark Attributes *before* skipping field results + bool m_bOpen; //Entry open, awaiting being closed + bool m_bConsumedByField; bool m_isAnnotationOnEnd; ///< annotation already moved onto its end pos. sal_Int32 mnStartCP; sal_Int32 mnEndCP; - bool bIsParaEnd; + bool m_bIsParaEnd; SW_DLLPUBLIC SwFltStackEntry(const SwPosition & rStartPos, std::unique_ptr pHt ); SW_DLLPUBLIC ~SwFltStackEntry(); @@ -112,8 +112,8 @@ public: void SetEndCP(sal_Int32 nCP) {mnEndCP = nCP;} sal_Int32 GetStartCP() const {return mnStartCP;} sal_Int32 GetEndCP() const {return mnEndCP;} - bool IsParaEnd() const { return bIsParaEnd;} - void SetIsParaEnd(bool bArg){ bIsParaEnd = bArg;} + bool IsParaEnd() const { return m_bIsParaEnd;} + void SetIsParaEnd(bool bArg){ m_bIsParaEnd = bArg;} }; template<> struct o3tl::typed_flags: o3tl::is_typed_flags {}; @@ -280,18 +280,18 @@ public: class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem { std::shared_ptr m_xTOXBase; - bool bHadBreakItem; // there was a break item BEFORE insertion of the TOX - bool bHadPageDescItem; + bool m_bHadBreakItem; // there was a break item BEFORE insertion of the TOX + bool m_bHadPageDescItem; public: SwFltTOX(std::shared_ptr xBase); // "purely virtual methods" of SfxPoolItem virtual bool operator==(const SfxPoolItem&) const override; virtual SwFltTOX* Clone(SfxItemPool* = nullptr) const override; const SwTOXBase& GetBase() const { return *m_xTOXBase; } - void SetHadBreakItem( bool bVal ) { bHadBreakItem = bVal; } - void SetHadPageDescItem( bool bVal ) { bHadPageDescItem = bVal; } - bool HadBreakItem() const { return bHadBreakItem; } - bool HadPageDescItem() const { return bHadPageDescItem; } + void SetHadBreakItem( bool bVal ) { m_bHadBreakItem = bVal; } + void SetHadPageDescItem( bool bVal ) { m_bHadPageDescItem = bVal; } + bool HadBreakItem() const { return m_bHadBreakItem; } + bool HadPageDescItem() const { return m_bHadPageDescItem; } }; // The WWEndStack behaves like the WWControlStack, except that the attributes diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx index 2e5dcbf4b976..5bf126833afe 100644 --- a/sw/source/filter/inc/msfilter.hxx +++ b/sw/source/filter/inc/msfilter.hxx @@ -326,7 +326,7 @@ namespace sw explicit SetEndIfOpen(const SwPosition &rPos) : mrPos(rPos) {} void operator()(const std::unique_ptr & pEntry) const { - if (pEntry->bOpen) + if (pEntry->m_bOpen) pEntry->SetEndPos(mrPos); } SetEndIfOpen(SetEndIfOpen const &) = default; diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx index ddb43f77adbe..f4394f76c4e4 100644 --- a/sw/source/filter/ww8/writerhelper.cxx +++ b/sw/source/filter/ww8/writerhelper.cxx @@ -713,8 +713,8 @@ namespace sw bool operator()(const std::unique_ptr & pEntry) const { const SwFltRedline *pTest = static_cast - (pEntry->pAttr.get()); - return (pEntry->bOpen && (pTest->m_eType == meType)); + (pEntry->m_pAttr.get()); + return (pEntry->m_bOpen && (pTest->m_eType == meType)); } }; @@ -808,7 +808,7 @@ namespace sw mrDoc.getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | RedlineFlags::ShowInsert | RedlineFlags::ShowDelete); const SwFltRedline *pFltRedline = static_cast - (pEntry->pAttr.get()); + (pEntry->m_pAttr.get()); SwRedlineData aData(pFltRedline->m_eType, pFltRedline->m_nAutorNo, pFltRedline->m_aStamp, OUString(), nullptr); @@ -829,9 +829,9 @@ namespace sw const std::unique_ptr & pTwoE) const { const SwFltRedline *pOne= static_cast - (pOneE->pAttr.get()); + (pOneE->m_pAttr.get()); const SwFltRedline *pTwo= static_cast - (pTwoE->pAttr.get()); + (pTwoE->m_pAttr.get()); //Return the earlier time, if two have the same time, prioritize //inserts over deletes diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 5054f1d9b6bf..195b646f85b4 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -679,7 +679,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, OUString sURL; for (size_t nI = m_xCtrlStck->size(); nI > nCount; --nI) { - const SfxPoolItem *pItem = ((*m_xCtrlStck)[nI-1]).pAttr.get(); + const SfxPoolItem *pItem = ((*m_xCtrlStck)[nI-1]).m_pAttr.get(); sal_uInt16 nWhich = pItem->Which(); if (nWhich == RES_TXTATR_INETFMT) { @@ -715,7 +715,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(WW8_CP nStartCp, WW8_CP nEndCp, { for (size_t i = nCurrentCount; i < m_xCtrlStck->size(); ++i) { - const SfxPoolItem *pItem = ((*m_xCtrlStck)[i]).pAttr.get(); + const SfxPoolItem *pItem = ((*m_xCtrlStck)[i]).m_pAttr.get(); sal_uInt16 nWhich = pItem->Which(); if( nWhich < RES_FLTRATTR_BEGIN || nWhich >= RES_FLTRATTR_END ) diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 9f8b38e6dd46..a4ce6ada24dd 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1203,7 +1203,7 @@ SwFltStackEntry* SwWW8FltControlStack::SetAttr(const SwPosition& rPos, sal_uInt1 for (size_t i=0; i < nCnt; ++i) { SwFltStackEntry& rEntry = (*this)[i]; - if (nAttrId == rEntry.pAttr->Which()) + if (nAttrId == rEntry.m_pAttr->Which()) { DeleteAndDestroy(i--); --nCnt; @@ -1336,7 +1336,7 @@ bool SwWW8FltControlStack::CheckSdOD(sal_Int32 nStart,sal_Int32 nEnd) void SwWW8ReferencedFltEndStack::SetAttrInDoc( const SwPosition& rTmpPos, SwFltStackEntry& rEntry ) { - switch( rEntry.pAttr->Which() ) + switch( rEntry.m_pAttr->Which() ) { case RES_FLTR_BOOKMARK: { @@ -1344,7 +1344,7 @@ void SwWW8ReferencedFltEndStack::SetAttrInDoc( const SwPosition& rTmpPos, // and which is not referenced. bool bInsertBookmarkIntoDoc = true; - SwFltBookmark* pFltBookmark = dynamic_cast(rEntry.pAttr.get()); + SwFltBookmark* pFltBookmark = dynamic_cast(rEntry.m_pAttr.get()); if ( pFltBookmark != nullptr && pFltBookmark->IsTOCBookmark() ) { const OUString& rName = pFltBookmark->GetName(); @@ -1370,7 +1370,7 @@ void SwWW8ReferencedFltEndStack::SetAttrInDoc( const SwPosition& rTmpPos, void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry& rEntry) { - switch (rEntry.pAttr->Which()) + switch (rEntry.m_pAttr->Which()) { case RES_LR_SPACE: { @@ -1384,7 +1384,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, SwPaM aRegion(rTmpPos); if (rEntry.MakeRegion(m_rDoc, aRegion, SwFltStackEntry::RegionMode::NoCheck)) { - SvxLRSpaceItem aNewLR( *static_cast(rEntry.pAttr.get()) ); + SvxLRSpaceItem aNewLR( *static_cast(rEntry.m_pAttr.get()) ); sal_uLong nStart = aRegion.Start()->nNode.GetIndex(); sal_uLong nEnd = aRegion.End()->nNode.GetIndex(); for(; nStart <= nEnd; ++nStart) @@ -1458,7 +1458,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, if (nullptr != pFrame) { const SwFormatINetFormat *pAttr = static_cast( - rEntry.pAttr.get()); + rEntry.m_pAttr.get()); SwFormatURL aURL; aURL.SetURL(pAttr->GetValue(), false); aURL.SetTargetFrameName(pAttr->GetTargetFrame()); @@ -1466,7 +1466,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition& rTmpPos, } else { - m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr); + m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.m_pAttr); } } } @@ -1531,9 +1531,9 @@ const SfxPoolItem* SwWW8FltControlStack::GetStackAttr(const SwPosition& rPos, while (nSize) { const SwFltStackEntry& rEntry = (*this)[ --nSize ]; - if (rEntry.pAttr->Which() == nWhich) + if (rEntry.m_pAttr->Which() == nWhich) { - if ( (rEntry.bOpen) || + if ( (rEntry.m_bOpen) || ( (rEntry.m_aMkPos.m_nNode <= aFltPos.m_nNode) && (rEntry.m_aPtPos.m_nNode >= aFltPos.m_nNode) && @@ -1546,7 +1546,7 @@ const SfxPoolItem* SwWW8FltControlStack::GetStackAttr(const SwPosition& rPos, * means props that end at 3 are not included */ { - return rEntry.pAttr.get(); + return rEntry.m_pAttr.get(); } } } @@ -1579,7 +1579,7 @@ bool SwWW8FltRefStack::IsFootnoteEdnBkmField( void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry& rEntry) { - switch (rEntry.pAttr->Which()) + switch (rEntry.m_pAttr->Which()) { /* Look up these in our lists of bookmarks that were changed to @@ -1593,7 +1593,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos, SwNodeIndex aIdx(rEntry.m_aMkPos.m_nNode, 1); SwPaM aPaM(aIdx, rEntry.m_aMkPos.m_nContent); - SwFormatField& rFormatField = *static_cast(rEntry.pAttr.get()); + SwFormatField& rFormatField = *static_cast(rEntry.m_pAttr.get()); SwField* pField = rFormatField.GetField(); if (!RefToVar(pField, rEntry)) @@ -1623,7 +1623,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition& rTmpPos, } } - m_rDoc.getIDocumentContentOperations().InsertPoolItem(aPaM, *rEntry.pAttr); + m_rDoc.getIDocumentContentOperations().InsertPoolItem(aPaM, *rEntry.m_pAttr); MoveAttrs(*aPaM.GetPoint()); } break; diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 8d9c235cc06c..940571d3502b 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -1334,7 +1334,7 @@ SwFltStackEntry *SwWW8FltRefStack::RefToVar(const SwField* pField, SwGetExpField aField( static_cast( m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::GetExp)), sName, nsSwGetSetExpType::GSE_STRING, 0); SwFormatField aTmp(aField); - rEntry.pAttr.reset( aTmp.Clone() ); + rEntry.m_pAttr.reset( aTmp.Clone() ); pRet = &rEntry; } } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 96b1203f46e8..b5a5623fd22a 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2258,16 +2258,16 @@ WW8DupProperties::WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStack) for (size_t i=0; i < nCnt; ++i) { const SwFltStackEntry& rEntry = (*pCtrlStck)[ i ]; - if (rEntry.bOpen) + if (rEntry.m_bOpen) { - if (isCHRATR(rEntry.pAttr->Which())) + if (isCHRATR(rEntry.m_pAttr->Which())) { - aChrSet.Put( *rEntry.pAttr ); + aChrSet.Put( *rEntry.m_pAttr ); } - else if (isPARATR(rEntry.pAttr->Which())) + else if (isPARATR(rEntry.m_pAttr->Which())) { - aParSet.Put( *rEntry.pAttr ); + aParSet.Put( *rEntry.m_pAttr ); } } } -- cgit v1.2.3