sw/source/filter/ww8/ww8par.cxx | 72 +++++++++++++++++++--------------------
sw/source/filter/ww8/ww8par.hxx | 40 ++++++++++-----------
sw/source/filter/ww8/ww8par5.cxx | 20 +++++-----
3 files changed, 66 insertions(+), 66 deletions(-)
New commits:
commit 817b8fe7001a83cb74910eb09b7c14a3b95b8a39
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon May 16 08:25:41 2022 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon May 16 11:29:49 2022 +0200
sw: prefix members of SwMSDffManager, SwWW8FltControlStack, ...
... SwWW8FltRefStack and SwWW8ReferencedFltEndStack
See tdf#94879 for motivation.
Change-Id: I93ac7230bc383433d7232c5d14ed98339620316f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134380
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 35a3568b1dd7..f59d81ed6efb 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -478,7 +478,7 @@ Sttb::getStringAtIndex( sal_uInt32 index )
SwMSDffManager::SwMSDffManager( SwWW8ImplReader& rRdr, bool bSkipImages )
: SvxMSDffManager(*rRdr.m_pTableStream, rRdr.GetBaseURL(),
rRdr.m_xWwFib->m_fcDggInfo,
rRdr.m_pDataStream, nullptr, 0, COL_WHITE, rRdr.m_pStrm, bSkipImages),
- rReader(rRdr), pFallbackStream(nullptr)
+ m_rReader(rRdr), m_pFallbackStream(nullptr)
{
SetSvxMSDffSettings( GetSvxMSDffSettings() );
nSvxMSDffOLEConvFlags = SwMSDffManager::GetFilterFlags();
@@ -526,10 +526,10 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId,
if( GetOLEStorageName( nOLEId, sStorageName, xSrcStg, xDstStg ))
{
tools::SvRef<SotStorage> xSrc = xSrcStg->OpenSotStorage( sStorageName
);
- OSL_ENSURE(rReader.m_xFormImpl, "No Form Implementation!");
+ OSL_ENSURE(m_rReader.m_xFormImpl, "No Form Implementation!");
css::uno::Reference< css::drawing::XShape > xShape;
- if ( (!(rReader.m_bIsHeader || rReader.m_bIsFooter)) &&
- rReader.m_xFormImpl->ReadOCXStream(xSrc,&xShape,true))
+ if ( (!(m_rReader.m_bIsHeader || m_rReader.m_bIsFooter)) &&
+ m_rReader.m_xFormImpl->ReadOCXStream(xSrc,&xShape,true))
{
pRet = SdrObject::getSdrObjectFromXShape(xShape);
}
@@ -548,7 +548,7 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId,
nError,
nSvxMSDffOLEConvFlags,
css::embed::Aspects::MSOLE_CONTENT,
- rReader.GetBaseURL());
+ m_rReader.GetBaseURL());
}
}
return pRet;
@@ -556,20 +556,20 @@ SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId,
void SwMSDffManager::DisableFallbackStream()
{
- OSL_ENSURE(!pFallbackStream,
+ OSL_ENSURE(!m_pFallbackStream,
"if you're recursive, you're broken");
- pFallbackStream = pStData2;
- aOldEscherBlipCache = aEscherBlipCache;
+ m_pFallbackStream = pStData2;
+ m_aOldEscherBlipCache = aEscherBlipCache;
aEscherBlipCache.clear();
pStData2 = nullptr;
}
void SwMSDffManager::EnableFallbackStream()
{
- pStData2 = pFallbackStream;
- aEscherBlipCache = aOldEscherBlipCache;
- aOldEscherBlipCache.clear();
- pFallbackStream = nullptr;
+ pStData2 = m_pFallbackStream;
+ aEscherBlipCache = m_aOldEscherBlipCache;
+ m_aOldEscherBlipCache.clear();
+ m_pFallbackStream = nullptr;
}
sal_uInt16 SwWW8ImplReader::GetToggleAttrFlags() const
@@ -1110,10 +1110,10 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
sal_uInt16 nRawRecId,nRawRecSize;
if( bRet )
aMemStream.ReadUInt16( nRawRecId ).ReadUInt16( nRawRecSize );
- SwDocShell* pDocShell = rReader.m_pDocShell;
+ SwDocShell* pDocShell = m_rReader.m_pDocShell;
if (pDocShell)
{
- rReader.ReadEmbeddedData(aMemStream, pDocShell, hlStr);
+ m_rReader.ReadEmbeddedData(aMemStream, pDocShell, hlStr);
}
}
@@ -1189,7 +1189,7 @@ SwFltStackEntry* SwWW8FltControlStack::SetAttr(const
SwPosition& rPos, sal_uInt1
// Doing a textbox, and using the control stack only as a temporary
// collection point for properties which will are not to be set into
// the real document
- if (rReader.m_xPlcxMan && rReader.m_xPlcxMan->GetDoingDrawTextBox())
+ if (m_rReader.m_xPlcxMan && m_rReader.m_xPlcxMan->GetDoingDrawTextBox())
{
size_t nCnt = size();
for (size_t i=0; i < nCnt; ++i)
@@ -1313,8 +1313,8 @@ void SwWW8ReferencedFltEndStack::SetAttrInDoc( const
SwPosition& rTmpPos,
if ( pFltBookmark != nullptr && pFltBookmark->IsTOCBookmark() )
{
const OUString& rName = pFltBookmark->GetName();
- std::set< OUString, SwWW8::ltstr >::const_iterator aResult =
aReferencedTOCBookmarks.find(rName);
- if ( aResult == aReferencedTOCBookmarks.end() )
+ std::set< OUString, SwWW8::ltstr >::const_iterator aResult =
m_aReferencedTOCBookmarks.find(rName);
+ if ( aResult == m_aReferencedTOCBookmarks.end() )
{
bInsertBookmarkIntoDoc = false;
}
@@ -1374,12 +1374,12 @@ void SwWW8FltControlStack::SetAttrInDoc(const
SwPosition& rTmpPos,
{
// #i103711#
const bool bFirstLineIndentSet =
- (
rReader.m_aTextNodesHavingFirstLineOfstSet.end() !=
-
rReader.m_aTextNodesHavingFirstLineOfstSet.find( pNode ) );
+ (
m_rReader.m_aTextNodesHavingFirstLineOfstSet.end() !=
+
m_rReader.m_aTextNodesHavingFirstLineOfstSet.find( pNode ) );
// #i105414#
const bool bLeftIndentSet =
- (
rReader.m_aTextNodesHavingLeftIndentSet.end() !=
-
rReader.m_aTextNodesHavingLeftIndentSet.find( pNode ) );
+ (
m_rReader.m_aTextNodesHavingLeftIndentSet.end() !=
+
m_rReader.m_aTextNodesHavingLeftIndentSet.find( pNode ) );
SyncIndentWithList( aNewLR, *pNum,
bFirstLineIndentSet,
bLeftIndentSet );
@@ -1464,8 +1464,8 @@ const SfxPoolItem*
SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos,
SfxItemState eState = SfxItemState::DEFAULT;
if (const SfxItemSet *pSet = pNd->GetpSwAttrSet())
eState = pSet->GetItemState(RES_LR_SPACE, false);
- if (eState != SfxItemState::SET && rReader.m_nCurrentColl <
rReader.m_vColl.size())
- pItem =
rReader.m_vColl[rReader.m_nCurrentColl].maWordLR.get();
+ if (eState != SfxItemState::SET && m_rReader.m_nCurrentColl <
m_rReader.m_vColl.size())
+ pItem =
m_rReader.m_vColl[m_rReader.m_nCurrentColl].maWordLR.get();
}
/*
@@ -6598,13 +6598,13 @@ bool SwMSDffManager::GetOLEStorageName(sal_uInt32
nOLEId, OUString& rStorageName
bool bRet = false;
sal_Int32 nPictureId = 0;
- if (rReader.m_pStg)
+ if (m_rReader.m_pStg)
{
// Via the TextBox-PLCF we get the right char Start-End positions
// We should then find the EmbeddedField and the corresponding Sprms
// in that Area.
// We only need the Sprm for the Picture Id.
- sal_uInt64 nOldPos = rReader.m_pStrm->Tell();
+ sal_uInt64 nOldPos = m_rReader.m_pStrm->Tell();
{
// #i32596# - consider return value of method
// <rReader.GetTxbxTextSttEndCp(..)>. If it returns false, method
@@ -6612,17 +6612,17 @@ bool SwMSDffManager::GetOLEStorageName(sal_uInt32
nOLEId, OUString& rStorageName
// Note: Ask MM for initialization of <nStartCp> and <nEndCp>.
// Note: Ask MM about assertions in method
<rReader.GetTxbxTextSttEndCp(..)>.
WW8_CP nStartCp, nEndCp;
- if ( rReader.m_bDrawCpOValid &&
rReader.GetTxbxTextSttEndCp(nStartCp, nEndCp,
+ if ( m_rReader.m_bDrawCpOValid &&
m_rReader.GetTxbxTextSttEndCp(nStartCp, nEndCp,
o3tl::narrowing<sal_uInt16>((nOLEId >> 16) &
0xFFFF),
o3tl::narrowing<sal_uInt16>(nOLEId & 0xFFFF)) )
{
WW8PLCFxSaveAll aSave;
- rReader.m_xPlcxMan->SaveAllPLCFx( aSave );
+ m_rReader.m_xPlcxMan->SaveAllPLCFx( aSave );
- nStartCp += rReader.m_nDrawCpO;
- nEndCp += rReader.m_nDrawCpO;
- WW8PLCFx_Cp_FKP* pChp = rReader.m_xPlcxMan->GetChpPLCF();
- wwSprmParser aSprmParser(*rReader.m_xWwFib);
+ nStartCp += m_rReader.m_nDrawCpO;
+ nEndCp += m_rReader.m_nDrawCpO;
+ WW8PLCFx_Cp_FKP* pChp = m_rReader.m_xPlcxMan->GetChpPLCF();
+ wwSprmParser aSprmParser(*m_rReader.m_xWwFib);
while (nStartCp <= nEndCp && !nPictureId)
{
if (!pChp->SeekPos( nStartCp))
@@ -6656,21 +6656,21 @@ bool SwMSDffManager::GetOLEStorageName(sal_uInt32
nOLEId, OUString& rStorageName
nStartCp = aDesc.nEndPos;
}
- rReader.m_xPlcxMan->RestoreAllPLCFx( aSave );
+ m_rReader.m_xPlcxMan->RestoreAllPLCFx( aSave );
}
}
- rReader.m_pStrm->Seek( nOldPos );
+ m_rReader.m_pStrm->Seek( nOldPos );
}
if( bRet )
{
rStorageName = "_";
rStorageName += OUString::number(nPictureId);
- rSrcStorage = rReader.m_pStg->OpenSotStorage(SL::aObjectPool);
- if (!rReader.m_pDocShell)
+ rSrcStorage = m_rReader.m_pStg->OpenSotStorage(SL::aObjectPool);
+ if (!m_rReader.m_pDocShell)
bRet=false;
else
- rDestStorage = rReader.m_pDocShell->GetStorage();
+ rDestStorage = m_rReader.m_pDocShell->GetStorage();
}
return bRet;
}
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index e0f68dbb7f8c..e59768e2788b 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -367,10 +367,10 @@ public:
class SwWW8FltControlStack : public SwFltControlStack
{
private:
- SwWW8ImplReader& rReader;
+ SwWW8ImplReader& m_rReader;
std::unique_ptr<SfxItemSet> m_xScratchSet;
- sal_uInt16 nToggleAttrFlags;
- sal_uInt16 nToggleBiDiAttrFlags;
+ sal_uInt16 m_nToggleAttrFlags;
+ sal_uInt16 m_nToggleBiDiAttrFlags;
SwWW8FltControlStack(const SwWW8FltControlStack&) = delete;
SwWW8FltControlStack& operator=(const SwWW8FltControlStack&) = delete;
const SwNumFormat* GetNumFormatFromStack(const SwPosition &rPos,
@@ -381,8 +381,8 @@ protected:
public:
SwWW8FltControlStack(SwDoc& rDo, sal_uLong nFieldFl, SwWW8ImplReader&
rReader_ )
- : SwFltControlStack( rDo, nFieldFl ), rReader( rReader_ ),
- nToggleAttrFlags(0), nToggleBiDiAttrFlags(0)
+ : SwFltControlStack( rDo, nFieldFl ), m_rReader( rReader_ ),
+ m_nToggleAttrFlags(0), m_nToggleBiDiAttrFlags(0)
{}
void NewAttr(const SwPosition& rPos, const SfxPoolItem& rAttr);
@@ -392,24 +392,24 @@ public:
void SetToggleAttr(sal_uInt8 nId, bool bOn)
{
if( bOn )
- nToggleAttrFlags |= (1 << nId);
+ m_nToggleAttrFlags |= (1 << nId);
else
- nToggleAttrFlags &= ~(1 << nId);
+ m_nToggleAttrFlags &= ~(1 << nId);
}
- sal_uInt16 GetToggleAttrFlags() const { return nToggleAttrFlags; }
+ sal_uInt16 GetToggleAttrFlags() const { return m_nToggleAttrFlags; }
void SetToggleBiDiAttr(sal_uInt8 nId, bool bOn)
{
if( bOn )
- nToggleBiDiAttrFlags |= (1 << nId);
+ m_nToggleBiDiAttrFlags |= (1 << nId);
else
- nToggleBiDiAttrFlags &= ~(1 << nId);
+ m_nToggleBiDiAttrFlags &= ~(1 << nId);
}
- sal_uInt16 GetToggleBiDiAttrFlags() const { return nToggleBiDiAttrFlags; }
- void SetToggleAttrFlags(sal_uInt16 nFlags) { nToggleAttrFlags = nFlags; }
- void SetToggleBiDiAttrFlags(sal_uInt16 nFlags) {nToggleBiDiAttrFlags =
nFlags;}
+ sal_uInt16 GetToggleBiDiAttrFlags() const { return m_nToggleBiDiAttrFlags;
}
+ void SetToggleAttrFlags(sal_uInt16 nFlags) { m_nToggleAttrFlags = nFlags; }
+ void SetToggleBiDiAttrFlags(sal_uInt16 nFlags) {m_nToggleBiDiAttrFlags =
nFlags;}
const SfxPoolItem* GetFormatAttr(const SwPosition& rPos, sal_uInt16
nWhich);
template<class T> const T* GetFormatAttr( const SwPosition& rPos,
TypedWhichId<T> nWhich )
@@ -451,12 +451,12 @@ class SwWW8ReferencedFltEndStack : public SwFltEndStack
public:
SwWW8ReferencedFltEndStack( SwDoc& rDo, sal_uLong nFieldFl )
: SwFltEndStack( rDo, nFieldFl )
- , aReferencedTOCBookmarks()
+ , m_aReferencedTOCBookmarks()
{}
// Keep track of referenced TOC bookmarks in order to suppress the import
// of unreferenced ones.
- std::set<OUString, SwWW8::ltstr> aReferencedTOCBookmarks;
+ std::set<OUString, SwWW8::ltstr> m_aReferencedTOCBookmarks;
protected:
virtual void SetAttrInDoc( const SwPosition& rTmpPos,
SwFltStackEntry& rEntry ) override;
@@ -467,14 +467,14 @@ class SwWW8FltRefStack final : public SwFltEndStack
public:
SwWW8FltRefStack(SwDoc& rDo, sal_uLong nFieldFl)
: SwFltEndStack( rDo, nFieldFl )
- , aFieldVarNames()
+ , m_aFieldVarNames()
{}
bool IsFootnoteEdnBkmField(const SwFormatField& rFormatField, sal_uInt16&
rBkmNo);
//Keep track of variable names created with fields, and the bookmark
//mapped to their position, hopefully the same, but very possibly
//an additional pseudo bookmark
- std::map<OUString, OUString, SwWW8::ltstr> aFieldVarNames;
+ std::map<OUString, OUString, SwWW8::ltstr> m_aFieldVarNames;
private:
SwFltStackEntry *RefToVar(const SwField* pField,SwFltStackEntry& rEntry);
virtual void SetAttrInDoc(const SwPosition& rTmpPos,
@@ -745,9 +745,9 @@ private:
class SwMSDffManager : public SvxMSDffManager
{
private:
- SwWW8ImplReader& rReader;
- SvStream *pFallbackStream;
- std::unordered_map<sal_uInt32, Graphic> aOldEscherBlipCache;
+ SwWW8ImplReader& m_rReader;
+ SvStream *m_pFallbackStream;
+ std::unordered_map<sal_uInt32, Graphic> m_aOldEscherBlipCache;
virtual bool GetOLEStorageName( sal_uInt32 nOLEId, OUString& rStorageName,
tools::SvRef<SotStorage>& rSrcStorage, css::uno::Reference <
css::embed::XStorage >& rDestStorage ) const override;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 5b29666a9ee2..0de01678a4bd 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1316,13 +1316,13 @@ tools::Long SwWW8ImplReader::MapBookmarkVariables(const
WW8FieldDesc* pF,
}
else
{
- nNo = m_xReffingStck->aFieldVarNames.size()+1;
+ nNo = m_xReffingStck->m_aFieldVarNames.size()+1;
sName = "WWSetBkmk" + OUString::number(nNo);
nNo += m_xPlcxMan->GetBook()->GetIMax();
}
m_xReffedStck->NewAttr(*m_pPaM->GetPoint(),
SwFltBookmark( BookmarkToWriter(sName), rData, nNo ));
- m_xReffingStck->aFieldVarNames[rOrigName] = sName;
+ m_xReffingStck->m_aFieldVarNames[rOrigName] = sName;
return nNo;
}
@@ -1345,9 +1345,9 @@ SwFltStackEntry *SwWW8FltRefStack::RefToVar(const
SwField* pField,
//Get the name of the ref field, and see if actually a variable
const OUString sName = pField->GetPar1();
std::map<OUString, OUString, SwWW8::ltstr>::const_iterator
- aResult = aFieldVarNames.find(sName);
+ aResult = m_aFieldVarNames.find(sName);
- if (aResult != aFieldVarNames.end())
+ if (aResult != m_aFieldVarNames.end())
{
SwGetExpField aField( static_cast<SwGetExpFieldType*>(
m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::GetExp)), sName,
nsSwGetSetExpType::GSE_STRING, 0);
@@ -1368,9 +1368,9 @@ OUString
SwWW8ImplReader::GetMappedBookmark(std::u16string_view rOrigName)
//See if there has been a variable set with this name, if so get
//the pseudo bookmark name that was set with it.
std::map<OUString, OUString, SwWW8::ltstr>::const_iterator aResult =
- m_xReffingStck->aFieldVarNames.find(sName);
+ m_xReffingStck->m_aFieldVarNames.find(sName);
- return (aResult == m_xReffingStck->aFieldVarNames.end())
+ return (aResult == m_xReffingStck->m_aFieldVarNames.end())
? sName : (*aResult).second;
}
@@ -2138,7 +2138,7 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*,
OUString& rStr )
{
sBkmName = EnsureTOCBookmarkName(sBkmName);
// track <sBookmarkName> as referenced TOC bookmark.
- m_xReffedStck->aReferencedTOCBookmarks.insert( sBkmName );
+ m_xReffedStck->m_aReferencedTOCBookmarks.insert( sBkmName );
}
SwGetRefField aField(
@@ -2246,7 +2246,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*,
OUString& rStr )
{
sBookmarkName = EnsureTOCBookmarkName(sName);
// track <sBookmarkName> as referenced TOC bookmark.
- m_xReffedStck->aReferencedTOCBookmarks.insert( sBookmarkName );
+ m_xReffedStck->m_aReferencedTOCBookmarks.insert( sBookmarkName
);
}
else
{
@@ -2271,7 +2271,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*,
OUString& rStr )
{
sPageRefBookmarkName = EnsureTOCBookmarkName(sName);
// track <sPageRefBookmarkName> as referenced TOC bookmark.
- m_xReffedStck->aReferencedTOCBookmarks.insert( sPageRefBookmarkName );
+ m_xReffedStck->m_aReferencedTOCBookmarks.insert( sPageRefBookmarkName
);
}
else
{
@@ -3566,7 +3566,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc*
/*pF*/, OUString& rStr
{
sMark = EnsureTOCBookmarkName(sMark);
// track <sMark> as referenced TOC bookmark.
- m_xReffedStck->aReferencedTOCBookmarks.insert( sMark );
+ m_xReffedStck->m_aReferencedTOCBookmarks.insert( sMark
);
}
if (m_bLoadingTOXCache)
