sw/inc/SwAppletImpl.hxx | 18 +++---
sw/source/filter/basflt/fltshell.cxx | 92 ++++++++++++++++-----------------
sw/source/filter/html/SwAppletImpl.cxx | 18 +++---
sw/source/filter/inc/fltshell.hxx | 34 ++++++------
sw/source/filter/ww8/writerhelper.cxx | 12 ++--
sw/source/filter/ww8/ww8par.cxx | 20 +++----
sw/source/filter/ww8/ww8par5.cxx | 2
7 files changed, 98 insertions(+), 98 deletions(-)
New commits:
commit 76ae0359f35baeb4f8adf1d121c0f974c9024997
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue May 25 08:50:42 2021 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue May 25 09:54:46 2021 +0200
sw: prefix members of SwApplet_Impl, SwFltAnchor, SwFltControlStack and ...
... SwFltRedline
See tdf#94879 for motivation.
Change-Id: Ib70ed34b46f68650fbb3f1fa01cb2232a1909fa8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116080
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 615dbee0a827..309b356a2a6f 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -38,15 +38,15 @@ enum class SwHtmlOptType {
class SwApplet_Impl
{
- css::uno::Reference < css::embed::XEmbeddedObject > xApplet;
- SvCommandList aCommandList;
- SfxItemSet aItemSet;
- OUString sAlt;
+ css::uno::Reference < css::embed::XEmbeddedObject > m_xApplet;
+ SvCommandList m_aCommandList;
+ SfxItemSet m_aItemSet;
+ OUString m_sAlt;
public:
static SwHtmlOptType GetOptionType( const OUString& rName, bool bApplet );
SwApplet_Impl( SfxItemPool& rPool );
- SwApplet_Impl( SfxItemSet const & rSet ): aItemSet ( rSet) {}
+ SwApplet_Impl( SfxItemSet const & rSet ): m_aItemSet ( rSet) {}
~SwApplet_Impl();
void CreateApplet( const OUString& rCode, const OUString& rName,
bool bMayScript, const OUString& rCodeBase,
@@ -56,10 +56,10 @@ public:
void AppendParam( const OUString& rName, const OUString& rValue );
#endif
void FinishApplet();
- const css::uno::Reference < css::embed::XEmbeddedObject >& GetApplet()
const { return xApplet; }
- SfxItemSet& GetItemSet() { return aItemSet; }
- const OUString& GetAltText() const { return sAlt; }
- void SetAltText( const OUString& rAlt ) {sAlt = rAlt;}
+ const css::uno::Reference < css::embed::XEmbeddedObject >& GetApplet()
const { return m_xApplet; }
+ SfxItemSet& GetItemSet() { return m_aItemSet; }
+ const OUString& GetAltText() const { return m_sAlt; }
+ void SetAltText( const OUString& rAlt ) {m_sAlt = rAlt;}
};
#endif
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index 43bea4896896..f2c6c8c7eac4 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -173,7 +173,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM&
rRegion, RegionMode eCheck)
}
SwFltControlStack::SwFltControlStack(SwDoc& rDo, sal_uLong nFieldFl)
- : nFieldFlags(nFieldFl),bHasSdOD(true), bSdODChecked(false), rDoc(rDo),
bIsEndStack(false)
+ : m_nFieldFlags(nFieldFl),m_bHasSdOD(true), m_bSdODChecked(false),
m_rDoc(rDo), m_bIsEndStack(false)
{
}
@@ -204,7 +204,7 @@ void SwFltControlStack::MoveAttrs(const SwPosition& rPos,
MoveAttrsMode eMode)
{
rEntry.m_aMkPos.m_nContent++;
OSL_ENSURE( rEntry.m_aMkPos.m_nContent
- <= rDoc.GetNodes()[nPosNd]->GetContentNode()->Len(),
+ <= m_rDoc.GetNodes()[nPosNd]->GetContentNode()->Len(),
"Attribute ends after end of line" );
}
if (
@@ -225,7 +225,7 @@ void SwFltControlStack::MoveAttrs(const SwPosition& rPos,
MoveAttrsMode eMode)
}
rEntry.m_aPtPos.m_nContent++;
OSL_ENSURE( rEntry.m_aPtPos.m_nContent
- <= rDoc.GetNodes()[nPosNd]->GetContentNode()->Len(),
+ <= m_rDoc.GetNodes()[nPosNd]->GetContentNode()->Len(),
"Attribute ends after end of line" );
}
}
@@ -293,8 +293,8 @@ void SwFltControlStack::DeleteAndDestroy(Entries::size_type
nCnt)
if ( empty() )
{
ClearParaEndPosition();
- bHasSdOD = true;
- bSdODChecked = false;
+ m_bHasSdOD = true;
+ m_bSdODChecked = false;
}
}
@@ -413,7 +413,7 @@ SwFltStackEntry* SwFltControlStack::SetAttr(const
SwPosition& rPos,
// Never apply end stack except at document ending
if (bTstEnd)
{
- if (bIsEndStack)
+ if (m_bIsEndStack)
{
++aI;
continue;
@@ -540,13 +540,13 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
SwFrameFormat* pFormat =
static_cast<SwFltAnchor*>(rEntry.pAttr.get())->GetFrameFormat();
if (pFormat != nullptr)
{
- MakePoint(rEntry, rDoc, aRegion);
+ MakePoint(rEntry, m_rDoc, aRegion);
SwFormatAnchor aAnchor(pFormat->GetAnchor());
aAnchor.SetAnchor(aRegion.GetPoint());
pFormat->SetFormatAttr(aAnchor);
// So the frames will be created when inserting into
// existing doc (after setting the anchor!):
- if (rDoc.getIDocumentLayoutAccess().GetCurrentViewShell()
+ if (m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell()
&& (RndStdIds::FLY_AT_PARA ==
pFormat->GetAnchor().GetAnchorId()))
{
pFormat->MakeFrames();
@@ -566,10 +566,10 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
case RES_FLTR_NUMRULE: // insert Numrule
{
const OUString& rNumNm =
static_cast<SfxStringItem*>(rEntry.pAttr.get())->GetValue();
- SwNumRule* pNumRule = rDoc.FindNumRulePtr( rNumNm );
+ SwNumRule* pNumRule = m_rDoc.FindNumRulePtr( rNumNm );
if( pNumRule )
{
- if (rEntry.MakeRegion(rDoc, aRegion,
SwFltStackEntry::RegionMode::CheckNodes))
+ if (rEntry.MakeRegion(m_rDoc, aRegion,
SwFltStackEntry::RegionMode::CheckNodes))
{
SwNodeIndex aTmpStart( aRegion.Start()->nNode );
SwNodeIndex aTmpEnd( aTmpStart );
@@ -579,14 +579,14 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
{
SwPaM aTmpPam( aTmpStart, aTmpEnd );
// no start of a new list
- rDoc.SetNumRule( aTmpPam, *pNumRule, false );
+ m_rDoc.SetNumRule( aTmpPam, *pNumRule, false );
aTmpStart = aTmpEnd; // here starts the next range
++aTmpStart;
}
}
else
- rDoc.DelNumRule( rNumNm );
+ m_rDoc.DelNumRule( rNumNm );
}
}
break;
@@ -598,35 +598,35 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
if (IsFlagSet(BOOK_TO_VAR_REF))
{
- SwFieldType* pFT =
rDoc.getIDocumentFieldsAccess().GetFieldType(SwFieldIds::SetExp, rName, false);
+ SwFieldType* pFT =
m_rDoc.getIDocumentFieldsAccess().GetFieldType(SwFieldIds::SetExp, rName,
false);
if (!pFT)
{
- SwSetExpFieldType aS(&rDoc, rName,
nsSwGetSetExpType::GSE_STRING);
- pFT = rDoc.getIDocumentFieldsAccess().InsertFieldType(aS);
+ SwSetExpFieldType aS(&m_rDoc, rName,
nsSwGetSetExpType::GSE_STRING);
+ pFT =
m_rDoc.getIDocumentFieldsAccess().InsertFieldType(aS);
}
SwSetExpField aField(static_cast<SwSetExpFieldType*>(pFT),
pB->GetValSys());
aField.SetSubType( nsSwExtendedSubType::SUB_INVISIBLE );
- MakePoint(rEntry, rDoc, aRegion);
- rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion,
SwFormatField(aField));
+ MakePoint(rEntry, m_rDoc, aRegion);
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion,
SwFormatField(aField));
MoveAttrs( *(aRegion.GetPoint()) );
}
if ( ( !IsFlagSet(HYPO) || IsFlagSet(BOOK_AND_REF) ) &&
!rEntry.bConsumedByField )
{
- MakeBookRegionOrPoint(rEntry, rDoc, aRegion);
+ MakeBookRegionOrPoint(rEntry, m_rDoc, aRegion);
// #i120879# - create a cross reference heading bookmark if
appropriate.
const IDocumentMarkAccess::MarkType eBookmarkType =
( pB->IsTOCBookmark() &&
IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( aRegion ) )
? IDocumentMarkAccess::MarkType::CROSSREF_HEADING_BOOKMARK
: IDocumentMarkAccess::MarkType::BOOKMARK;
- rDoc.getIDocumentMarkAccess()->makeMark(aRegion, rName,
eBookmarkType, sw::mark::InsertMode::New);
+ m_rDoc.getIDocumentMarkAccess()->makeMark(aRegion, rName,
eBookmarkType, sw::mark::InsertMode::New);
}
}
break;
case RES_FLTR_ANNOTATIONMARK:
{
- if (MakeBookRegionOrPoint(rEntry, rDoc, aRegion))
+ if (MakeBookRegionOrPoint(rEntry, m_rDoc, aRegion))
{
SwTextNode const*const pTextNode(
aRegion.End()->nNode.GetNode().GetTextNode());
@@ -650,7 +650,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
--aRegion.Start()->nContent;
}
-
rDoc.getIDocumentMarkAccess()->makeAnnotationMark(aRegion, OUString());
+
m_rDoc.getIDocumentMarkAccess()->makeAnnotationMark(aRegion, OUString());
}
else
{
@@ -668,7 +668,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
break;
case RES_FLTR_RDFMARK:
{
- if (MakeBookRegionOrPoint(rEntry, rDoc, aRegion))
+ if (MakeBookRegionOrPoint(rEntry, m_rDoc, aRegion))
{
SwFltRDFMark* pMark =
static_cast<SwFltRDFMark*>(rEntry.pAttr.get());
if (aRegion.GetNode().IsTextNode())
@@ -692,7 +692,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
break;
case RES_FLTR_TOX:
{
- MakePoint(rEntry, rDoc, aRegion);
+ MakePoint(rEntry, m_rDoc, aRegion);
SwPosition* pPoint = aRegion.GetPoint();
@@ -700,7 +700,7 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
// test if on this node there had been a pagebreak BEFORE the
// tox attribute was put on the stack
- SfxItemSet aBkSet( rDoc.GetAttrPool(), svl::Items<RES_PAGEDESC,
RES_BREAK>{} );
+ SfxItemSet aBkSet( m_rDoc.GetAttrPool(), svl::Items<RES_PAGEDESC,
RES_BREAK>{} );
SwContentNode* pNd = nullptr;
if( !pTOXAttr->HadBreakItem() || !pTOXAttr->HadPageDescItem() )
{
@@ -734,22 +734,22 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
break;
case RES_FLTR_REDLINE:
{
- if (rEntry.MakeRegion(rDoc, aRegion,
+ if (rEntry.MakeRegion(m_rDoc, aRegion,
SwFltStackEntry::RegionMode::CheckNodes|SwFltStackEntry::RegionMode::CheckFieldmark))
{
- rDoc.getIDocumentRedlineAccess().SetRedlineFlags(
RedlineFlags::On
+ m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(
RedlineFlags::On
| RedlineFlags::ShowInsert
| RedlineFlags::ShowDelete );
SwFltRedline& rFltRedline =
*static_cast<SwFltRedline*>(rEntry.pAttr.get());
- SwRedlineData aData(rFltRedline.eType,
- rFltRedline.nAutorNo,
- rFltRedline.aStamp,
+ SwRedlineData aData(rFltRedline.m_eType,
+ rFltRedline.m_nAutorNo,
+ rFltRedline.m_aStamp,
OUString(),
nullptr
);
- rDoc.getIDocumentRedlineAccess().AppendRedline( new
SwRangeRedline(aData, aRegion), true );
- rDoc.getIDocumentRedlineAccess().SetRedlineFlags(
RedlineFlags::NONE
+ m_rDoc.getIDocumentRedlineAccess().AppendRedline( new
SwRangeRedline(aData, aRegion), true );
+ m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(
RedlineFlags::NONE
| RedlineFlags::ShowInsert
| RedlineFlags::ShowDelete );
}
@@ -758,26 +758,26 @@ void SwFltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
default:
{
// Revised for more complex situations should be considered
- if ( !bSdODChecked )
+ if ( !m_bSdODChecked )
{
- bHasSdOD = HasSdOD();
- bSdODChecked = true;
+ m_bHasSdOD = HasSdOD();
+ m_bSdODChecked = true;
}
sal_Int32 nStart = rEntry.GetStartCP();
sal_Int32 nEnd = rEntry.GetEndCP();
if (nStart != -1 && nEnd != -1 && nEnd >= nStart )
{
- rEntry.SetIsParaEnd( IsParaEndInCPs(nStart,nEnd,bHasSdOD) );
+ rEntry.SetIsParaEnd( IsParaEndInCPs(nStart,nEnd,m_bHasSdOD) );
}
- if (rEntry.MakeRegion(rDoc, aRegion,
SwFltStackEntry::RegionMode::NoCheck))
+ if (rEntry.MakeRegion(m_rDoc, aRegion,
SwFltStackEntry::RegionMode::NoCheck))
{
if (rEntry.IsParaEnd())
{
-
rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr,
SetAttrMode::DEFAULT, nullptr, true);
+
m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr,
SetAttrMode::DEFAULT, nullptr, true);
}
else
{
-
rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr);
+
m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr);
}
}
}
@@ -919,17 +919,17 @@ void SwFltControlStack::Delete(const SwPaM &rPam)
// methods of SwFltAnchor follow
SwFltAnchor::SwFltAnchor(SwFrameFormat* pFormat) :
- SfxPoolItem(RES_FLTR_ANCHOR), pFrameFormat(pFormat)
+ SfxPoolItem(RES_FLTR_ANCHOR), m_pFrameFormat(pFormat)
{
- pListener.reset(new SwFltAnchorListener(this));
- pListener->StartListening(pFrameFormat->GetNotifier());
+ m_pListener.reset(new SwFltAnchorListener(this));
+ m_pListener->StartListening(m_pFrameFormat->GetNotifier());
}
SwFltAnchor::SwFltAnchor(const SwFltAnchor& rCpy) :
- SfxPoolItem(RES_FLTR_ANCHOR), pFrameFormat(rCpy.pFrameFormat)
+ SfxPoolItem(RES_FLTR_ANCHOR), m_pFrameFormat(rCpy.m_pFrameFormat)
{
- pListener.reset(new SwFltAnchorListener(this));
- pListener->StartListening(pFrameFormat->GetNotifier());
+ m_pListener.reset(new SwFltAnchorListener(this));
+ m_pListener->StartListening(m_pFrameFormat->GetNotifier());
}
SwFltAnchor::~SwFltAnchor()
@@ -938,14 +938,14 @@ SwFltAnchor::~SwFltAnchor()
void SwFltAnchor::SetFrameFormat(SwFrameFormat * _pFrameFormat)
{
- pFrameFormat = _pFrameFormat;
+ m_pFrameFormat = _pFrameFormat;
}
bool SwFltAnchor::operator==(const SfxPoolItem& rItem) const
{
return SfxPoolItem::operator==(rItem) &&
- pFrameFormat == static_cast<const SwFltAnchor&>(rItem).pFrameFormat;
+ m_pFrameFormat == static_cast<const
SwFltAnchor&>(rItem).m_pFrameFormat;
}
SwFltAnchor* SwFltAnchor::Clone(SfxItemPool*) const
diff --git a/sw/source/filter/html/SwAppletImpl.cxx
b/sw/source/filter/html/SwAppletImpl.cxx
index fe79b0d26753..ce26f96687c0 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -109,7 +109,7 @@ SwHtmlOptType SwApplet_Impl::GetOptionType( const OUString&
rName, bool bApplet
return nType;
}
SwApplet_Impl::SwApplet_Impl( SfxItemPool& rPool ) :
- aItemSet( rPool, svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} )
+ m_aItemSet( rPool, svl::Items<RES_FRMATR_BEGIN, RES_FRMATR_END-1>{} )
{
}
@@ -121,14 +121,14 @@ void SwApplet_Impl::CreateApplet( const OUString& rCode,
const OUString& rName,
OUString aName;
// create Applet; it will be in running state
- xApplet = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_APPLET_CLASSID
).GetByteSequence(), aName );
- ::svt::EmbeddedObjectRef::TryRunningState( xApplet );
+ m_xApplet = aCnt.CreateEmbeddedObject( SvGlobalName( SO3_APPLET_CLASSID
).GetByteSequence(), aName );
+ ::svt::EmbeddedObjectRef::TryRunningState( m_xApplet );
INetURLObject aUrlBase(rDocumentBaseURL);
aUrlBase.removeSegment();
OUString sDocBase =
aUrlBase.GetMainURL(INetURLObject::DecodeMechanism::NONE);
- uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(),
uno::UNO_QUERY );
+ uno::Reference < beans::XPropertySet > xSet( m_xApplet->getComponent(),
uno::UNO_QUERY );
if ( xSet.is() )
{
xSet->setPropertyValue("AppletCode", uno::makeAny( rCode ) );
@@ -147,10 +147,10 @@ bool SwApplet_Impl::CreateApplet( const OUString&
rBaseURL )
OUString aCode, aName, aCodeBase;
bool bMayScript = false;
- size_t nArgCount = aCommandList.size();
+ size_t nArgCount = m_aCommandList.size();
for( size_t i = 0; i < nArgCount; i++ )
{
- const SvCommand& rArg = aCommandList[i];
+ const SvCommand& rArg = m_aCommandList[i];
const OUString& rName = rArg.GetCommand();
if( rName.equalsIgnoreAsciiCase( OOO_STRING_SVTOOLS_HTML_O_code ) )
aCode = rArg.GetArgument();
@@ -174,11 +174,11 @@ SwApplet_Impl::~SwApplet_Impl()
}
void SwApplet_Impl::FinishApplet()
{
- uno::Reference < beans::XPropertySet > xSet( xApplet->getComponent(),
uno::UNO_QUERY );
+ uno::Reference < beans::XPropertySet > xSet( m_xApplet->getComponent(),
uno::UNO_QUERY );
if ( xSet.is() )
{
uno::Sequence < beans::PropertyValue > aProps;
- aCommandList.FillSequence( aProps );
+ m_aCommandList.FillSequence( aProps );
xSet->setPropertyValue("AppletCommands", uno::makeAny( aProps ) );
}
}
@@ -186,7 +186,7 @@ void SwApplet_Impl::FinishApplet()
#if HAVE_FEATURE_JAVA
void SwApplet_Impl::AppendParam( const OUString& rName, const OUString& rValue
)
{
- aCommandList.Append( rName, rValue );
+ m_aCommandList.Append( rName, rValue );
}
#endif
diff --git a/sw/source/filter/inc/fltshell.hxx
b/sw/source/filter/inc/fltshell.hxx
index 4fb13a48e06c..e30f54822f8d 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -127,14 +127,14 @@ private:
typedef std::vector<std::unique_ptr<SwFltStackEntry>> Entries;
Entries m_Entries;
- sal_uLong nFieldFlags;
+ sal_uLong m_nFieldFlags;
- bool bHasSdOD;
- bool bSdODChecked;
+ bool m_bHasSdOD;
+ bool m_bSdODChecked;
protected:
- SwDoc& rDoc;
- bool bIsEndStack;
+ SwDoc& m_rDoc;
+ bool m_bIsEndStack;
virtual void SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry&
rEntry);
virtual sal_Int32 GetCurrAttrCP() const {return -1;}
@@ -162,7 +162,7 @@ public:
SwFltControlStack(SwDoc& rDo, sal_uLong nFieldFl);
virtual ~SwFltControlStack();
- bool IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);}
+ bool IsFlagSet(Flags no) const { return ::SwFltGetFlag(m_nFieldFlags,
no);}
void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr );
@@ -186,8 +186,8 @@ class SwFltAnchorListener;
class SW_DLLPUBLIC SwFltAnchor: public SfxPoolItem
{
- SwFrameFormat* pFrameFormat;
- std::unique_ptr<SwFltAnchorListener> pListener;
+ SwFrameFormat* m_pFrameFormat;
+ std::unique_ptr<SwFltAnchorListener> m_pListener;
public:
SwFltAnchor(SwFrameFormat* pFlyFormat);
@@ -198,8 +198,8 @@ public:
virtual bool operator==(const SfxPoolItem&) const override;
virtual SwFltAnchor* Clone(SfxItemPool* = nullptr) const override;
void SetFrameFormat(SwFrameFormat* _pFrameFormat);
- const SwFrameFormat* GetFrameFormat() const { return pFrameFormat; }
- SwFrameFormat* GetFrameFormat() { return pFrameFormat; }
+ const SwFrameFormat* GetFrameFormat() const { return m_pFrameFormat; }
+ SwFrameFormat* GetFrameFormat() { return m_pFrameFormat; }
};
class SwFltAnchorListener : public SvtListener
@@ -213,16 +213,16 @@ class SwFltAnchorListener : public SvtListener
class SW_DLLPUBLIC SwFltRedline : public SfxPoolItem
{
public:
- DateTime aStamp;
- RedlineType eType;
- std::size_t nAutorNo;
+ DateTime m_aStamp;
+ RedlineType m_eType;
+ std::size_t m_nAutorNo;
SwFltRedline(RedlineType eType_,
std::size_t nAutorNo_,
const DateTime& rStamp_)
- : SfxPoolItem(RES_FLTR_REDLINE), aStamp(rStamp_),
- eType(eType_),
- nAutorNo(nAutorNo_)
+ : SfxPoolItem(RES_FLTR_REDLINE), m_aStamp(rStamp_),
+ m_eType(eType_),
+ m_nAutorNo(nAutorNo_)
{
}
@@ -303,7 +303,7 @@ public:
SwFltEndStack(SwDoc& rDo, sal_uLong nFieldFl)
:SwFltControlStack(rDo, nFieldFl)
{
- bIsEndStack = true;
+ m_bIsEndStack = true;
}
};
diff --git a/sw/source/filter/ww8/writerhelper.cxx
b/sw/source/filter/ww8/writerhelper.cxx
index 2a5182f63c26..ddb43f77adbe 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -714,7 +714,7 @@ namespace sw
{
const SwFltRedline *pTest = static_cast<const SwFltRedline *>
(pEntry->pAttr.get());
- return (pEntry->bOpen && (pTest->eType == meType));
+ return (pEntry->bOpen && (pTest->m_eType == meType));
}
};
@@ -810,8 +810,8 @@ namespace sw
const SwFltRedline *pFltRedline = static_cast<const
SwFltRedline*>
(pEntry->pAttr.get());
- SwRedlineData aData(pFltRedline->eType, pFltRedline->nAutorNo,
- pFltRedline->aStamp, OUString(), nullptr);
+ SwRedlineData aData(pFltRedline->m_eType,
pFltRedline->m_nAutorNo,
+ pFltRedline->m_aStamp, OUString(), nullptr);
SwRangeRedline *const pNewRedline(new SwRangeRedline(aData,
aRegion));
// the point node may be deleted in AppendRedline, so park
@@ -835,10 +835,10 @@ namespace sw
//Return the earlier time, if two have the same time, prioritize
//inserts over deletes
- if (pOne->aStamp == pTwo->aStamp)
- return (pOne->eType == RedlineType::Insert && pTwo->eType !=
RedlineType::Insert);
+ if (pOne->m_aStamp == pTwo->m_aStamp)
+ return (pOne->m_eType == RedlineType::Insert && pTwo->m_eType
!= RedlineType::Insert);
else
- return (pOne->aStamp < pTwo->aStamp);
+ return (pOne->m_aStamp < pTwo->m_aStamp);
}
RedlineStack::~RedlineStack()
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 574d7dd5356d..a86e6f5b2687 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1298,7 +1298,7 @@ const SwNumFormat*
SwWW8FltControlStack::GetNumFormatFromStack(const SwPosition
if (rTextNode.IsCountedInList())
{
OUString sName(static_cast<const
SfxStringItem*>(pItem)->GetValue());
- const SwNumRule *pRule = rDoc.FindNumRulePtr(sName);
+ const SwNumRule *pRule = m_rDoc.FindNumRulePtr(sName);
if (pRule)
pRet = GetNumFormatFromSwNumRuleLevel(*pRule,
rTextNode.GetActualListLevel());
}
@@ -1382,14 +1382,14 @@ void SwWW8FltControlStack::SetAttrInDoc(const
SwPosition& rTmpPos,
paragraph indent to be relative to the new paragraph indent
*/
SwPaM aRegion(rTmpPos);
- if (rEntry.MakeRegion(rDoc, aRegion,
SwFltStackEntry::RegionMode::NoCheck))
+ if (rEntry.MakeRegion(m_rDoc, aRegion,
SwFltStackEntry::RegionMode::NoCheck))
{
SvxLRSpaceItem aNewLR(
*static_cast<SvxLRSpaceItem*>(rEntry.pAttr.get()) );
sal_uLong nStart = aRegion.Start()->nNode.GetIndex();
sal_uLong nEnd = aRegion.End()->nNode.GetIndex();
for(; nStart <= nEnd; ++nStart)
{
- SwNode* pNode = rDoc.GetNodes()[ nStart ];
+ SwNode* pNode = m_rDoc.GetNodes()[ nStart ];
if (!pNode || !pNode->IsTextNode())
continue;
@@ -1448,7 +1448,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
case RES_TXTATR_INETFMT:
{
SwPaM aRegion(rTmpPos);
- if (rEntry.MakeRegion(rDoc, aRegion,
SwFltStackEntry::RegionMode::NoCheck))
+ if (rEntry.MakeRegion(m_rDoc, aRegion,
SwFltStackEntry::RegionMode::NoCheck))
{
SwFrameFormat *pFrame;
// If we have just one single inline graphic then
@@ -1466,7 +1466,7 @@ void SwWW8FltControlStack::SetAttrInDoc(const SwPosition&
rTmpPos,
}
else
{
-
rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr);
+
m_rDoc.getIDocumentContentOperations().InsertPoolItem(aRegion, *rEntry.pAttr);
}
}
}
@@ -1485,7 +1485,7 @@ const SfxPoolItem*
SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos,
{
SwContentNode const*const pNd = rPos.nNode.GetNode().GetContentNode();
if (!pNd)
- pItem = &rDoc.GetAttrPool().GetDefaultItem(nWhich);
+ pItem = &m_rDoc.GetAttrPool().GetDefaultItem(nWhich);
else
{
/*
@@ -1510,7 +1510,7 @@ const SfxPoolItem*
SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos,
if (pNd->IsTextNode())
{
const sal_Int32 nPos = rPos.nContent.GetIndex();
- m_xScratchSet.reset(new SfxItemSet(rDoc.GetAttrPool(),
{{nWhich, nWhich}}));
+ m_xScratchSet.reset(new SfxItemSet(m_rDoc.GetAttrPool(),
{{nWhich, nWhich}}));
if (pNd->GetTextNode()->GetParaAttr(*m_xScratchSet, nPos,
nPos))
pItem = m_xScratchSet->GetItem(nWhich);
}
@@ -1563,7 +1563,7 @@ bool SwWW8FltRefStack::IsFootnoteEdnBkmField(
&& ((REF_FOOTNOTE == (nSubType = pField->GetSubType())) ||
(REF_ENDNOTE == nSubType))
&& !static_cast<const
SwGetRefField*>(pField)->GetSetRefName().isEmpty())
{
- const IDocumentMarkAccess* const pMarkAccess =
rDoc.getIDocumentMarkAccess();
+ const IDocumentMarkAccess* const pMarkAccess =
m_rDoc.getIDocumentMarkAccess();
IDocumentMarkAccess::const_iterator_t ppBkmk =
pMarkAccess->findMark( static_cast<const
SwGetRefField*>(pField)->GetSetRefName() );
if(ppBkmk != pMarkAccess->getAllMarksEnd())
@@ -1601,7 +1601,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition&
rTmpPos,
sal_uInt16 nBkmNo;
if( IsFootnoteEdnBkmField(rFormatField, nBkmNo) )
{
- ::sw::mark::IMark const * const pMark =
rDoc.getIDocumentMarkAccess()->getAllMarksBegin()[nBkmNo];
+ ::sw::mark::IMark const * const pMark =
m_rDoc.getIDocumentMarkAccess()->getAllMarksBegin()[nBkmNo];
const SwPosition& rBkMrkPos = pMark->GetMarkPos();
@@ -1623,7 +1623,7 @@ void SwWW8FltRefStack::SetAttrInDoc(const SwPosition&
rTmpPos,
}
}
- rDoc.getIDocumentContentOperations().InsertPoolItem(aPaM,
*rEntry.pAttr);
+ m_rDoc.getIDocumentContentOperations().InsertPoolItem(aPaM,
*rEntry.pAttr);
MoveAttrs(*aPaM.GetPoint());
}
break;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index cb9a66db152b..8d9c235cc06c 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1332,7 +1332,7 @@ SwFltStackEntry *SwWW8FltRefStack::RefToVar(const
SwField* pField,
if (aResult != aFieldVarNames.end())
{
SwGetExpField aField( static_cast<SwGetExpFieldType*>(
-
rDoc.getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::GetExp)), sName,
nsSwGetSetExpType::GSE_STRING, 0);
+
m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(SwFieldIds::GetExp)), sName,
nsSwGetSetExpType::GSE_STRING, 0);
SwFormatField aTmp(aField);
rEntry.pAttr.reset( aTmp.Clone() );
pRet = &rEntry;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
