sw: prefix members of WW8DupProperties, WW8SelBoxInfo, WW8_WrPc and ...
... WW8_WrtBookmarks
See tdf#94879 for motivation.
Change-Id: I4a3ede4c48220fb61ee8ccb4bbfb955a46cf56d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135686
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index fdf0bd0..33228cb 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -164,19 +164,19 @@ public:
// class WW8_WrPc collects all piece entries for one piece
class WW8_WrPc
{
WW8_CP nStartCp; // Starting character position of the text
WW8_FC nStartFc; // Starting file position of the text
sal_uInt16 nStatus; // End of paragraph inside the piece?
WW8_CP m_nStartCp; // Starting character position of the text
WW8_FC m_nStartFc; // Starting file position of the text
sal_uInt16 m_nStatus; // End of paragraph inside the piece?
public:
WW8_WrPc(WW8_FC nSFc, WW8_CP nSCp )
: nStartCp( nSCp ), nStartFc( nSFc ), nStatus( 0x0040 )
: m_nStartCp( nSCp ), m_nStartFc( nSFc ), m_nStatus( 0x0040 )
{}
void SetStatus() { nStatus = 0x0050; }
sal_uInt16 GetStatus() const { return nStatus; }
WW8_CP GetStartCp() const { return nStartCp; }
WW8_FC GetStartFc() const { return nStartFc; }
void SetStatus() { m_nStatus = 0x0050; }
sal_uInt16 GetStatus() const { return m_nStatus; }
WW8_CP GetStartCp() const { return m_nStartCp; }
WW8_FC GetStartFc() const { return m_nStartFc; }
};
typedef std::map<OUString,tools::Long> BKMKNames;
@@ -189,7 +189,7 @@ class WW8_WrtBookmarks
{
private:
/// Structure of one item inside this map: (startPos, (endPos, (a bool value?, bookmarkName)))
BKMKCPs aSttCps;
BKMKCPs maSttCps;
BKMKNames maSwBkmkNms;
WW8_WrtBookmarks(WW8_WrtBookmarks const&) = delete;
@@ -211,7 +211,7 @@ WW8_WrtBookmarks::WW8_WrtBookmarks()
WW8_WrtBookmarks::~WW8_WrtBookmarks()
{
for (auto& rEntry : aSttCps)
for (auto& rEntry : maSttCps)
{
if (rEntry.second)
{
@@ -228,12 +228,12 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm)
{
BKMK aBK(false,rNm);
BKMKCP* pBKCP = new BKMKCP(static_cast<tools::Long>(nStartCp),aBK);
aSttCps.insert(std::pair<tools::Long,BKMKCP*>(nStartCp,pBKCP));
maSttCps.insert(std::pair<tools::Long,BKMKCP*>(nStartCp,pBKCP));
aResult.first->second = static_cast<tools::Long>(nStartCp);
}
else
{
std::pair<CPItr,CPItr> aRange = aSttCps.equal_range(aResult.first->second);
std::pair<CPItr,CPItr> aRange = maSttCps.equal_range(aResult.first->second);
for (CPItr aItr = aRange.first;aItr != aRange.second;++aItr)
{
if (aItr->second && aItr->second->second.second == rNm)
@@ -249,7 +249,7 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm)
void WW8_WrtBookmarks::Write( WW8Export& rWrt)
{
if (aSttCps.empty())
if (maSttCps.empty())
return;
tools::Long n;
std::vector<OUString> aNames;
@@ -257,7 +257,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
SvMemoryStream aTempStrm2(65535,65535);
BKMKCPs aEndCps;
for (const auto& rEntry : aSttCps)
for (const auto& rEntry : maSttCps)
{
if (rEntry.second)
{
@@ -285,7 +285,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
rWrt.m_pFib->m_fcPlcfbkf = rStrm.Tell();
rStrm.WriteStream( aTempStrm1 );
SwWW8Writer::WriteLong(rStrm, rWrt.m_pFib->m_ccpText + rWrt.m_pFib->m_ccpTxbx);
for (const auto& rEntry : aSttCps)
for (const auto& rEntry : maSttCps)
{
if (rEntry.second)
{
@@ -301,7 +301,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo)
{
std::pair<CPItr,CPItr> aRange = aSttCps.equal_range(nFrom);
std::pair<CPItr,CPItr> aRange = maSttCps.equal_range(nFrom);
CPItr aItr = aRange.first;
while (aItr != aRange.second)
{
@@ -312,9 +312,9 @@ void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo)
aItr->second->second.first = true;
aItr->second->first = nTo;
}
aSttCps.insert(std::pair<tools::Long,BKMKCP*>(nTo,aItr->second));
maSttCps.insert(std::pair<tools::Long,BKMKCP*>(nTo,aItr->second));
aItr->second = nullptr;
aRange = aSttCps.equal_range(nFrom);
aRange = maSttCps.equal_range(nFrom);
aItr = aRange.first;
continue;
}
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index b92f756..ec90df0 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2679,7 +2679,7 @@ void WW8TabDesc::MergeCells()
}
else
break;
pActMGroup->nGroupWidth = nSizCell;
pActMGroup->m_nGroupWidth = nSizCell;
// locked previously created merge groups,
// after determining the size for the new merge group.
@@ -2688,12 +2688,12 @@ void WW8TabDesc::MergeCells()
for (;;)
{
WW8SelBoxInfo* p = FindMergeGroup(
nX1, pActMGroup->nGroupWidth, false );
nX1, pActMGroup->m_nGroupWidth, false );
if (p == nullptr)
{
break;
}
p->bGroupLocked = true;
p->m_bGroupLocked = true;
}
// 3. push to group array
@@ -2798,7 +2798,7 @@ void WW8TabDesc::FinishSwTable()
if((1 < groupIt->size()) && groupIt->row(0)[0])
{
SwFrameFormat* pNewFormat = groupIt->row(0)[0]->ClaimFrameFormat();
pNewFormat->SetFormatAttr(SwFormatFrameSize(SwFrameSize::Variable, groupIt->nGroupWidth, 0));
pNewFormat->SetFormatAttr(SwFormatFrameSize(SwFrameSize::Variable, groupIt->m_nGroupWidth, 0));
const sal_uInt16 nRowSpan = groupIt->rowsCount();
for (sal_uInt16 n = 0; n < nRowSpan; ++n)
{
@@ -2850,12 +2850,12 @@ WW8SelBoxInfo* WW8TabDesc::FindMergeGroup(short nX1, short nWidth, bool bExact)
{
// the currently inspected group
WW8SelBoxInfo& rActGroup = *m_MergeGroups[ iGr ];
if (!rActGroup.bGroupLocked)
if (!rActGroup.m_bGroupLocked)
{
// approximate group boundary with room (tolerance) to the *outside*
nGrX1 = rActGroup.nGroupXStart - nTolerance;
nGrX2 = rActGroup.nGroupXStart
+ rActGroup.nGroupWidth + nTolerance;
nGrX1 = rActGroup.m_nGroupXStart - nTolerance;
nGrX2 = rActGroup.m_nGroupXStart
+ rActGroup.m_nGroupWidth + nTolerance;
// If box fits report success
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index b8b2486..c43ff04 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -38,8 +38,8 @@ public:
private:
WW8DupProperties(const WW8DupProperties&) = delete;
WW8DupProperties& operator=(const WW8DupProperties&) = delete;
SwWW8FltControlStack* pCtrlStck;
SfxItemSetFixed<RES_CHRATR_BEGIN, RES_CHRATR_END - 1> aChrSet,aParSet;
SwWW8FltControlStack* m_pCtrlStck;
SfxItemSetFixed<RES_CHRATR_BEGIN, RES_CHRATR_END - 1> m_aChrSet,m_aParSet;
};
struct WW8SwFlyPara
@@ -159,12 +159,12 @@ private:
WW8SelBoxInfo& operator=(WW8SelBoxInfo const&) = delete;
public:
short nGroupXStart;
short nGroupWidth;
bool bGroupLocked;
short m_nGroupXStart;
short m_nGroupWidth;
bool m_bGroupLocked;
WW8SelBoxInfo(short nXCenter, short nWidth)
: nGroupXStart( nXCenter ), nGroupWidth( nWidth ), bGroupLocked(false)
: m_nGroupXStart( nXCenter ), m_nGroupWidth( nWidth ), m_bGroupLocked(false)
{}
size_t size() const
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 96059da..26102fd 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2274,26 +2274,26 @@ void WW8FlySet::Init(const SwWW8ImplReader& rReader, const SwPaM* pPaM)
}
WW8DupProperties::WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStack)
: pCtrlStck(pStack),
aChrSet(rDoc.GetAttrPool()),
aParSet(rDoc.GetAttrPool())
: m_pCtrlStck(pStack),
m_aChrSet(rDoc.GetAttrPool()),
m_aParSet(rDoc.GetAttrPool())
{
//Close any open character properties and duplicate them inside the
//first table cell
size_t nCnt = pCtrlStck->size();
size_t nCnt = m_pCtrlStck->size();
for (size_t i=0; i < nCnt; ++i)
{
const SwFltStackEntry& rEntry = (*pCtrlStck)[ i ];
const SwFltStackEntry& rEntry = (*m_pCtrlStck)[ i ];
if (rEntry.m_bOpen)
{
if (isCHRATR(rEntry.m_pAttr->Which()))
{
aChrSet.Put( *rEntry.m_pAttr );
m_aChrSet.Put( *rEntry.m_pAttr );
}
else if (isPARATR(rEntry.m_pAttr->Which()))
{
aParSet.Put( *rEntry.m_pAttr );
m_aParSet.Put( *rEntry.m_pAttr );
}
}
}
@@ -2301,7 +2301,7 @@ WW8DupProperties::WW8DupProperties(SwDoc &rDoc, SwWW8FltControlStack *pStack)
void WW8DupProperties::Insert(const SwPosition &rPos)
{
for (const SfxItemSet* pSet : {&aChrSet, &aParSet})
for (const SfxItemSet* pSet : {&m_aChrSet, &m_aParSet})
{
if( pSet->Count() )
{
@@ -2309,7 +2309,7 @@ void WW8DupProperties::Insert(const SwPosition &rPos)
const SfxPoolItem* pItem = aIter.GetCurItem();
do
{
pCtrlStck->NewAttr(rPos, *pItem);
m_pCtrlStck->NewAttr(rPos, *pItem);
} while ((pItem = aIter.NextItem()));
}
}
