sw/inc/flypos.hxx | 12 ++--
sw/inc/ndarr.hxx | 36 +++++++-------
sw/inc/ndindex.hxx | 14 ++---
sw/inc/node.hxx | 12 ++--
sw/inc/numrule.hxx | 8 +--
sw/source/core/doc/docnew.cxx | 4 -
sw/source/core/doc/number.cxx | 22 ++++----
sw/source/core/docnode/ndnum.cxx | 14 ++---
sw/source/core/docnode/ndtbl.cxx | 4 -
sw/source/core/docnode/node.cxx | 12 ++--
sw/source/core/docnode/nodes.cxx | 100 +++++++++++++++++++--------------------
sw/source/core/layout/flypos.cxx | 16 +++---
12 files changed, 127 insertions(+), 127 deletions(-)
New commits:
commit b0f7efe83096655348d32782636bf0f54d837834
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Oct 29 08:38:06 2015 +0100
sw: prefix members of SwNodes
Change-Id: I51a8161eeaa781ccace08605b97a0092f972b3bf
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 732fdc2..c3c1f50 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwNodes
friend class SwStartNode;
friend class ::sw::DocumentContentOperationsManager;
- SwNodeIndex* vIndices; ///< ring of all indices on nodes.
+ SwNodeIndex* m_vIndices; ///< ring of all indices on nodes.
void RemoveNode( sal_uLong nDelPos, sal_uLong nLen, bool bDel );
void InsertNode( const SwNodePtr pNode,
@@ -103,18 +103,18 @@ class SW_DLLPUBLIC SwNodes
void InsertNode( const SwNodePtr pNode,
sal_uLong nPos );
- SwDoc* pMyDoc; ///< This Doc contains the nodes-array.
+ SwDoc* m_pMyDoc; ///< This Doc contains the
nodes-array.
- SwNode *pEndOfPostIts, *pEndOfInserts, ///< These are the fixed ranges.
- *pEndOfAutotext, *pEndOfRedlines,
- *pEndOfContent;
+ SwNode *m_pEndOfPostIts, *m_pEndOfInserts, ///< These are the fixed
ranges.
+ *m_pEndOfAutotext, *m_pEndOfRedlines,
+ *m_pEndOfContent;
- mutable SwOutlineNodes* pOutlineNds; ///< Array of all outline
nodes.
+ mutable SwOutlineNodes* m_pOutlineNodes; ///< Array of all outline
nodes.
- bool bInNodesDel : 1; /**< In Case of recursive calling.
+ bool m_bInNodesDel : 1; /**< In Case of recursive calling.
Do not update Num/Outline. */
- bool bInDelUpdOutl : 1; ///< Flag for updating of Outline.
- bool bInDelUpdNum : 1; ///< Flag for updating of Outline.
+ bool m_bInDelUpdOutline : 1; ///< Flag for updating of Outline.
+ bool m_bInDelUpdNum : 1; ///< Flag for updating of Outline.
// Actions on the nodes.
static void SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex &
aEnd );
@@ -150,18 +150,18 @@ public:
FnForEach_SwNodes fnForEach, void* pArgs = 0 );
/// A still empty section.
- SwNode& GetEndOfPostIts() const { return *pEndOfPostIts; }
+ SwNode& GetEndOfPostIts() const { return *m_pEndOfPostIts; }
/// Section fpr all footnotes.
- SwNode& GetEndOfInserts() const { return *pEndOfInserts; }
+ SwNode& GetEndOfInserts() const { return *m_pEndOfInserts; }
/// Section for all Flys/Header/Footers.
- SwNode& GetEndOfAutotext() const { return *pEndOfAutotext; }
+ SwNode& GetEndOfAutotext() const { return *m_pEndOfAutotext; }
/// Section for all Redlines.
- SwNode& GetEndOfRedlines() const { return *pEndOfRedlines; }
+ SwNode& GetEndOfRedlines() const { return *m_pEndOfRedlines; }
/** This is the last EndNode of a special section. After it
there is only the regular ContentSection (i.e. the BodyText). */
- SwNode& GetEndOfExtras() const { return *pEndOfRedlines; }
+ SwNode& GetEndOfExtras() const { return *m_pEndOfRedlines; }
/// Regular ContentSection (i.e. the BodyText).
- SwNode& GetEndOfContent() const { return *pEndOfContent; }
+ SwNode& GetEndOfContent() const { return *m_pEndOfContent; }
/** Is the NodesArray the regular one of Doc? (and not the UndoNds, ...)
Implementation in doc.hxx (because one needs to know Doc for it) ! */
@@ -235,7 +235,7 @@ public:
SwAttrSet* pAutoAttr ); ///< in ndole.cxx
/// Array of all OutlineNodes.
- const SwOutlineNodes& GetOutLineNds() const { return *pOutlineNds;}
+ const SwOutlineNodes& GetOutLineNds() const { return *m_pOutlineNodes;}
/// Update all Nodes - Rule/Format-Change.
void UpdateOutlineNode(SwNode & rNd);
@@ -308,8 +308,8 @@ public:
bool const bCreateFrms = true);
/// Which Doc contains the nodes-array?
- SwDoc* GetDoc() { return pMyDoc; }
- const SwDoc* GetDoc() const { return pMyDoc; }
+ SwDoc* GetDoc() { return m_pMyDoc; }
+ const SwDoc* GetDoc() const { return m_pMyDoc; }
/** Search previous / next content node or table node with frames.
If no end is given begin with the FrameIndex, else start search
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 5d40d86..9f658b4 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -41,17 +41,17 @@ class SW_DLLPUBLIC SwNodeIndex final : public
sw::Ring<SwNodeIndex>
SwNodeIndex( SwNodes& rNds, int nIdx ) = delete;
void RegisterIndex( SwNodes& rNodes )
{
- if(!rNodes.vIndices)
- rNodes.vIndices = this;
- MoveTo(rNodes.vIndices);
+ if(!rNodes.m_vIndices)
+ rNodes.m_vIndices = this;
+ MoveTo(rNodes.m_vIndices);
}
void DeRegisterIndex( SwNodes& rNodes )
{
- if(rNodes.vIndices == this)
- rNodes.vIndices = GetNextInRing();
+ if(rNodes.m_vIndices == this)
+ rNodes.m_vIndices = GetNextInRing();
MoveTo(nullptr);
- if(rNodes.vIndices == this)
- rNodes.vIndices = nullptr;
+ if(rNodes.m_vIndices == this)
+ rNodes.m_vIndices = nullptr;
}
public:
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 93820dc..9fcbde5 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -447,9 +447,9 @@ SwDoc::~SwDoc()
// The ChapterNumbers/Numbers need to be deleted before the styles
// or we update all the time!
- m_pNodes->pOutlineNds->clear();
+ m_pNodes->m_pOutlineNodes->clear();
SwNodes & rUndoNodes( GetUndoManager().GetUndoNodes() );
- rUndoNodes.pOutlineNds->clear();
+ rUndoNodes.m_pOutlineNodes->clear();
mpFootnoteIdxs->clear();
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 7a5afbd..78d0b98 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -43,7 +43,7 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
if (pTextNd && pTextNd->IsOutlineStateChanged())
{
- bool bFound = pOutlineNds->find(pTextNd) != pOutlineNds->end();
+ bool bFound = m_pOutlineNodes->find(pTextNd) != m_pOutlineNodes->end();
if (pTextNd->IsOutline())
{
@@ -52,7 +52,7 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
// assure that text is in the correct nodes array
if ( &(pTextNd->GetNodes()) == this )
{
- pOutlineNds->insert(pTextNd);
+ m_pOutlineNodes->insert(pTextNd);
}
else
{
@@ -63,7 +63,7 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
else
{
if (bFound)
- pOutlineNds->erase(pTextNd);
+ m_pOutlineNodes->erase(pTextNd);
}
pTextNd->UpdateOutlineState();
@@ -75,22 +75,22 @@ void SwNodes::UpdateOutlineNode(SwNode & rNd)
void SwNodes::UpdateOutlineIdx( const SwNode& rNd )
{
- if( pOutlineNds->empty() ) // no OutlineNodes present ?
+ if( m_pOutlineNodes->empty() ) // no OutlineNodes present ?
return;
const SwNodePtr pSrch = const_cast<SwNodePtr>(&rNd);
sal_uInt16 nPos;
- if (!pOutlineNds->Seek_Entry(pSrch, &nPos))
+ if (!m_pOutlineNodes->Seek_Entry(pSrch, &nPos))
return;
- if( nPos == pOutlineNds->size() ) // none present for updating ?
+ if( nPos == m_pOutlineNodes->size() ) // none present for updating ?
return;
if( nPos )
--nPos;
if( !GetDoc()->IsInDtor() && IsDocNodes() )
- UpdateOutlineNode( *(*pOutlineNds)[ nPos ]);
+ UpdateOutlineNode( *(*m_pOutlineNodes)[ nPos ]);
}
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index b82a3c2..9215028 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -59,32 +59,32 @@ sal_uInt16 HighestLevel( SwNodes & rNodes, const
SwNodeRange & rRange );
* @param pDocument TODO: provide documentation
*/
SwNodes::SwNodes( SwDoc* pDocument )
- : vIndices(nullptr), pMyDoc( pDocument )
+ : m_vIndices(nullptr), m_pMyDoc( pDocument )
{
- bInNodesDel = bInDelUpdOutl = bInDelUpdNum = false;
+ m_bInNodesDel = m_bInDelUpdOutline = m_bInDelUpdNum = false;
- OSL_ENSURE( pMyDoc, "in which Doc am I?" );
+ OSL_ENSURE( m_pMyDoc, "in which Doc am I?" );
sal_uLong nPos = 0;
SwStartNode* pSttNd = new SwStartNode( *this, nPos++ );
- pEndOfPostIts = new SwEndNode( *this, nPos++, *pSttNd );
+ m_pEndOfPostIts = new SwEndNode( *this, nPos++, *pSttNd );
SwStartNode* pTmp = new SwStartNode( *this, nPos++ );
- pEndOfInserts = new SwEndNode( *this, nPos++, *pTmp );
+ m_pEndOfInserts = new SwEndNode( *this, nPos++, *pTmp );
pTmp = new SwStartNode( *this, nPos++ );
pTmp->pStartOfSection = pSttNd;
- pEndOfAutotext = new SwEndNode( *this, nPos++, *pTmp );
+ m_pEndOfAutotext = new SwEndNode( *this, nPos++, *pTmp );
pTmp = new SwStartNode( *this, nPos++ );
pTmp->pStartOfSection = pSttNd;
- pEndOfRedlines = new SwEndNode( *this, nPos++, *pTmp );
+ m_pEndOfRedlines = new SwEndNode( *this, nPos++, *pTmp );
pTmp = new SwStartNode( *this, nPos++ );
pTmp->pStartOfSection = pSttNd;
- pEndOfContent = new SwEndNode( *this, nPos++, *pTmp );
+ m_pEndOfContent = new SwEndNode( *this, nPos++, *pTmp );
- pOutlineNds = new SwOutlineNodes;
+ m_pOutlineNodes = new SwOutlineNodes;
}
/** Destructor
@@ -95,14 +95,14 @@ SwNodes::SwNodes( SwDoc* pDocument )
*/
SwNodes::~SwNodes()
{
- delete pOutlineNds;
+ delete m_pOutlineNodes;
{
SwNodeIndex aNdIdx( *this );
while( true )
{
SwNode *pNode = &aNdIdx.GetNode();
- if( pNode == pEndOfContent )
+ if( pNode == m_pEndOfContent )
break;
++aNdIdx;
@@ -111,7 +111,7 @@ SwNodes::~SwNodes()
}
// here, all SwNodeIndices must be unregistered
- delete pEndOfContent;
+ delete m_pEndOfContent;
}
void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
@@ -157,7 +157,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
if (pTextNode->IsOutline())
{
const SwNodePtr pSrch = &rNd;
- pOutlineNds->erase( pSrch );
+ m_pOutlineNodes->erase( pSrch );
}
}
@@ -172,7 +172,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
if (bInsOutlineIdx && rTextNd.IsOutline())
{
const SwNodePtr pSrch = &rNd;
- pOutlineNds->insert( pSrch );
+ m_pOutlineNodes->insert( pSrch );
}
rTextNd.InvalidateNumRule();
@@ -215,7 +215,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
// remove outline index from old nodes array
if (pTextNd->IsOutline())
{
- pOutlineNds->erase( pNd );
+ m_pOutlineNodes->erase( pNd );
}
// copy rules if needed
@@ -252,7 +252,7 @@ void SwNodes::ChgNode( SwNodeIndex& rDelPos, sal_uLong nSz,
// OultineNodes set the new nodes in the array
if (bInsOutlineIdx && pTextNd->IsOutline())
{
- rNds.pOutlineNds->insert( pTextNd );
+ rNds.m_pOutlineNodes->insert( pTextNd );
}
pTextNd->AddToList();
@@ -515,7 +515,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange,
SwNodes & rNodes,
// remove outline index from old nodes array
if (pCNd->IsTextNode() &&
pCNd->GetTextNode()->IsOutline())
{
- pOutlineNds->erase( pCNd );
+ m_pOutlineNodes->erase( pCNd );
}
else
pCNd = 0;
@@ -524,7 +524,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange,
SwNodes & rNodes,
BigPtrArray::Move( aMvIdx.GetIndex(),
aIdx.GetIndex() );
if( bInsOutlineIdx && pCNd )
- pOutlineNds->insert( pCNd );
+ m_pOutlineNodes->insert( pCNd );
if( pTmpNd->IsTextNode() )
static_cast<SwTextNode*>(pTmpNd)->AddToList();
}
@@ -548,7 +548,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange,
SwNodes & rNodes,
const bool bOutlNd = pNd->IsTextNode() &&
pNd->GetTextNode()->IsOutline();
// delete outline indices from old node array
if( bOutlNd )
- pOutlineNds->erase( pNd );
+ m_pOutlineNodes->erase( pNd );
RemoveNode( aMvIdx.GetIndex(), 1, false );
pNd->pStartOfSection = pSttNode;
@@ -557,7 +557,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange,
SwNodes & rNodes,
// set correct indices in Start/EndNodes
if( bInsOutlineIdx && bOutlNd )
// and put them into the new node array
- rNodes.pOutlineNds->insert( pNd );
+ rNodes.m_pOutlineNodes->insert( pNd );
else if( pNd->IsStartNode() )
pSttNode = static_cast<SwStartNode*>(pNd);
else if( pNd->IsEndNode() )
@@ -1100,8 +1100,8 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong
nNodes)
// problems if aEnd == aStart and aEnd is deleted, so aEnd <= aStart)
--aRg.aStart;
- bool bSaveInNodesDel = bInNodesDel;
- bInNodesDel = true;
+ bool bSaveInNodesDel = m_bInNodesDel;
+ m_bInNodesDel = true;
bool bUpdateOutline = false;
// loop until everything is deleted
@@ -1127,10 +1127,10 @@ void SwNodes::Delete(const SwNodeIndex &rIndex,
sal_uLong nNodes)
{
SwTextNode *const pTextNode(pNd->GetTextNode());
if (pTextNode->IsOutline() &&
- pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
+ m_pOutlineNodes->Seek_Entry( pNd, &nIdxPos ))
{
// remove outline indices
- pOutlineNds->erase(nIdxPos);
+ m_pOutlineNodes->erase(nIdxPos);
bUpdateOutline = true;
}
pTextNode->InvalidateNumRule();
@@ -1193,7 +1193,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, sal_uLong
nNodes)
if( pTextNd->IsOutline())
{
// delete outline indices
- pOutlineNds->erase( pTextNd );
+ m_pOutlineNodes->erase( pTextNd );
bUpdateOutline = true;
}
pTextNd->InvalidateNumRule();
@@ -1220,22 +1220,22 @@ void SwNodes::Delete(const SwNodeIndex &rIndex,
sal_uLong nNodes)
--aRg.aStart;
}
- bInNodesDel = bSaveInNodesDel;
+ m_bInNodesDel = bSaveInNodesDel;
- if( !bInNodesDel )
+ if( !m_bInNodesDel )
{
// update numbering
- if( bUpdateOutline || bInDelUpdOutl )
+ if( bUpdateOutline || m_bInDelUpdOutline )
{
UpdateOutlineIdx( aRg.aEnd.GetNode() );
- bInDelUpdOutl = false;
+ m_bInDelUpdOutline = false;
}
}
else
{
if( bUpdateOutline )
- bInDelUpdOutl = true;
+ m_bInDelUpdOutline = true;
}
}
@@ -1331,16 +1331,16 @@ inline bool TstIdx( sal_uLong nSttIdx, sal_uLong
nEndIdx, sal_uLong nStt, sal_uL
bool SwNodes::CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex&
rEnd ) const
{
sal_uLong nStt = rStt.GetIndex(), nEnd = rEnd.GetIndex();
- if( TstIdx( nStt, nEnd, pEndOfContent->StartOfSectionIndex(),
- pEndOfContent->GetIndex() )) return true;
- if( TstIdx( nStt, nEnd, pEndOfAutotext->StartOfSectionIndex(),
- pEndOfAutotext->GetIndex() )) return true;
- if( TstIdx( nStt, nEnd, pEndOfPostIts->StartOfSectionIndex(),
- pEndOfPostIts->GetIndex() )) return true;
- if( TstIdx( nStt, nEnd, pEndOfInserts->StartOfSectionIndex(),
- pEndOfInserts->GetIndex() )) return true;
- if( TstIdx( nStt, nEnd, pEndOfRedlines->StartOfSectionIndex(),
- pEndOfRedlines->GetIndex() )) return true;
+ if( TstIdx( nStt, nEnd, m_pEndOfContent->StartOfSectionIndex(),
+ m_pEndOfContent->GetIndex() )) return true;
+ if( TstIdx( nStt, nEnd, m_pEndOfAutotext->StartOfSectionIndex(),
+ m_pEndOfAutotext->GetIndex() )) return true;
+ if( TstIdx( nStt, nEnd, m_pEndOfPostIts->StartOfSectionIndex(),
+ m_pEndOfPostIts->GetIndex() )) return true;
+ if( TstIdx( nStt, nEnd, m_pEndOfInserts->StartOfSectionIndex(),
+ m_pEndOfInserts->GetIndex() )) return true;
+ if( TstIdx( nStt, nEnd, m_pEndOfRedlines->StartOfSectionIndex(),
+ m_pEndOfRedlines->GetIndex() )) return true;
return false; // is somewhere in the middle, ERROR
}
@@ -1358,9 +1358,9 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart,
sal_uLong nCnt )
{
// The whole nodes array will be destroyed, you're in the Doc's DTOR!
// The initial start/end nodes should be only destroyed in the
SwNodes' DTOR!
- SwNode* aEndNdArr[] = { pEndOfContent,
- pEndOfPostIts, pEndOfInserts,
- pEndOfAutotext, pEndOfRedlines,
+ SwNode* aEndNdArr[] = { m_pEndOfContent,
+ m_pEndOfPostIts, m_pEndOfInserts,
+ m_pEndOfAutotext, m_pEndOfRedlines,
0
};
@@ -1387,9 +1387,9 @@ void SwNodes::DelNodes( const SwNodeIndex & rStart,
sal_uLong nCnt )
{
// remove the outline indices
sal_uInt16 nIdxPos;
- if( pOutlineNds->Seek_Entry( pNd, &nIdxPos ))
+ if( m_pOutlineNodes->Seek_Entry( pNd, &nIdxPos ))
{
- pOutlineNds->erase(nIdxPos);
+ m_pOutlineNodes->erase(nIdxPos);
bUpdateNum = 1;
}
}
@@ -2266,7 +2266,7 @@ void SwNodes::RemoveNode( sal_uLong nDelPos, sal_uLong
nSz, bool bDel )
sal_uLong nEnd = nDelPos + nSz;
SwNode* pNew = (*this)[ nEnd ];
- for (SwNodeIndex& rIndex : vIndices->GetRingContainer())
+ for (SwNodeIndex& rIndex : m_vIndices->GetRingContainer())
{
sal_uLong const nIdx = rIndex.GetIndex();
if (nDelPos <= nIdx && nIdx < nEnd)
@@ -2345,7 +2345,7 @@ SwNode * SwNodes::DocumentSectionEndNode(SwNode * pNode)
const
bool SwNodes::IsDocNodes() const
{
- return this == &pMyDoc->GetNodes();
+ return this == &m_pMyDoc->GetNodes();
}
void SwNodes::dumpAsXml(xmlTextWriterPtr pWriter) const
commit dbcc527e14f5c45694dac3e6751b00b89be9bd58
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Oct 29 08:37:03 2015 +0100
sw: prefix members of SwNumFormat
Change-Id: I71c2004b411831ce869331ab7251683f78428b2b
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 8ad9031..5c35820 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -49,9 +49,9 @@ const sal_Unicode cBulletChar = 0x2022; ///< Character for
lists.
class SW_DLLPUBLIC SwNumFormat : public SvxNumberFormat, public SwClient
{
- SwFormatVertOrient* pVertOrient;
+ SwFormatVertOrient* m_pVertOrient;
//For i120928,record the cp info of graphic within bullet
- sal_Unicode cGrfBulletCP;
+ sal_Unicode m_cGrfBulletCP;
SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
using SvxNumberFormat::operator ==;
@@ -79,8 +79,8 @@ public:
virtual OUString GetCharFormatName() const override;
//For i120928,access the cp info of graphic within bullet
- void SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;}
- sal_Unicode GetGrfBulletCP() const {return cGrfBulletCP;}
+ void SetGrfBulletCP(sal_Unicode cP){m_cGrfBulletCP = cP;}
+ sal_Unicode GetGrfBulletCP() const {return m_cGrfBulletCP;}
virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const
Size* pSize = 0, const sal_Int16* pOrient = 0) override;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 4688d21..d1a2a2f 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -178,16 +178,16 @@ static void lcl_SetRuleChgd( SwTextNode& rNd, sal_uInt8
nLevel )
SwNumFormat::SwNumFormat() :
SvxNumberFormat(SVX_NUM_ARABIC),
SwClient( 0 ),
- pVertOrient(new SwFormatVertOrient( 0, text::VertOrientation::NONE))
- ,cGrfBulletCP(USHRT_MAX)//For i120928,record the cp info of graphic within
bullet
+ m_pVertOrient(new SwFormatVertOrient( 0, text::VertOrientation::NONE))
+ ,m_cGrfBulletCP(USHRT_MAX)//For i120928,record the cp info of graphic
within bullet
{
}
SwNumFormat::SwNumFormat( const SwNumFormat& rFormat) :
SvxNumberFormat(rFormat),
SwClient( rFormat.GetRegisteredInNonConst() ),
- pVertOrient(new SwFormatVertOrient( 0, rFormat.GetVertOrient()))
- ,cGrfBulletCP(rFormat.cGrfBulletCP)//For i120928,record the cp info of
graphic within bullet
+ m_pVertOrient(new SwFormatVertOrient( 0, rFormat.GetVertOrient()))
+ ,m_cGrfBulletCP(rFormat.m_cGrfBulletCP)//For i120928,record the cp info of
graphic within bullet
{
sal_Int16 eMyVertOrient = rFormat.GetVertOrient();
SetGraphicBrush( rFormat.GetBrush(), &rFormat.GetGraphicSize(),
@@ -196,8 +196,8 @@ SwNumFormat::SwNumFormat( const SwNumFormat& rFormat) :
SwNumFormat::SwNumFormat(const SvxNumberFormat& rNumFormat, SwDoc* pDoc)
: SvxNumberFormat(rNumFormat)
- , pVertOrient(new SwFormatVertOrient( 0, rNumFormat.GetVertOrient()))
- , cGrfBulletCP(USHRT_MAX)
+ , m_pVertOrient(new SwFormatVertOrient( 0, rNumFormat.GetVertOrient()))
+ , m_cGrfBulletCP(USHRT_MAX)
{
sal_Int16 eMyVertOrient = rNumFormat.GetVertOrient();
SetGraphicBrush( rNumFormat.GetBrush(), &rNumFormat.GetGraphicSize(),
@@ -222,7 +222,7 @@ SwNumFormat::SwNumFormat(const SvxNumberFormat& rNumFormat,
SwDoc* pDoc)
SwNumFormat::~SwNumFormat()
{
- delete pVertOrient;
+ delete m_pVertOrient;
}
// #i22362#
@@ -262,7 +262,7 @@ SwNumFormat& SwNumFormat::operator=( const SwNumFormat&
rNumFormat)
else if( GetRegisteredIn() )
GetRegisteredInNonConst()->Remove( this );
//For i120928,record the cp info of graphic within bullet
- cGrfBulletCP = rNumFormat.cGrfBulletCP;
+ m_cGrfBulletCP = rNumFormat.m_cGrfBulletCP;
return *this;
}
@@ -318,7 +318,7 @@ void SwNumFormat::SetGraphicBrush( const SvxBrushItem*
pBrushItem, const Size
const sal_Int16* pOrient)
{
if(pOrient)
- pVertOrient->SetVertOrient( *pOrient );
+ m_pVertOrient->SetVertOrient( *pOrient );
SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
}
@@ -365,8 +365,8 @@ const SwFormatVertOrient*
SwNumFormat::GetGraphicOrientation() const
return 0;
else
{
- pVertOrient->SetVertOrient(eOrient);
- return pVertOrient;
+ m_pVertOrient->SetVertOrient(eOrient);
+ return m_pVertOrient;
}
}
commit e754ed9d8c4535464d9003dcedc43cde6b0fd7b8
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Oct 29 08:36:07 2015 +0100
sw: prefix members of SwPosFlyFrm
Change-Id: I08a2c2bb8ebd8cb2adf25b23fa57a5c5441fcfea
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index a925524..f4d1a97 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -29,16 +29,16 @@ class SwNodeIndex;
/// For querying current flys in document.
class SW_DLLPUBLIC SwPosFlyFrm
{
- const SwFrameFormat* pFrameFormat; ///< FlyFrameFormat
- SwNodeIndex* pNdIdx; ///< Index for node is sufficient.
- sal_uInt32 nOrdNum;
+ const SwFrameFormat* m_pFrameFormat; ///< FlyFrameFormat
+ SwNodeIndex* m_pNodeIndex; ///< Index for node is sufficient.
+ sal_uInt32 m_nOrdNum;
public:
SwPosFlyFrm( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos
);
virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!)
- const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
- const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
- sal_uInt32 GetOrdNum() const { return nOrdNum; }
+ const SwFrameFormat& GetFormat() const { return *m_pFrameFormat; }
+ const SwNodeIndex& GetNdIndex() const { return *m_pNodeIndex; }
+ sal_uInt32 GetOrdNum() const { return m_nOrdNum; }
};
// define needed classes to safely handle an array of allocated SwPosFlyFrm(s).
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index e1f73d0..0582eaa 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -38,13 +38,13 @@ bool SwPosFlyFrmCmp::operator()(const SwPosFlyFrmPtr& rA,
const SwPosFlyFrmPtr&
SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrameFormat*
pFormat,
sal_uInt16 nArrPos )
- : pFrameFormat( pFormat ), pNdIdx( const_cast<SwNodeIndex*>(&rIdx) )
+ : m_pFrameFormat( pFormat ), m_pNodeIndex( const_cast<SwNodeIndex*>(&rIdx)
)
{
bool bFnd = false;
const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
if (FLY_AT_PAGE == rAnchor.GetAnchorId())
{
- pNdIdx = new SwNodeIndex( rIdx );
+ m_pNodeIndex = new SwNodeIndex( rIdx );
}
else if(
pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
{
@@ -54,7 +54,7 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const
SwFrameFormat* pFormat,
SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFormat>(*pFormat).First();
if( pFly )
{
- nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
+ m_nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
bFnd = true;
}
}
@@ -64,7 +64,7 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const
SwFrameFormat* pFormat,
SwDrawContact* pContact =
SwIterator<SwDrawContact,SwFormat>(*pFormat).First();
if( pContact )
{
- nOrdNum = pContact->GetMaster()->GetOrdNum();
+ m_nOrdNum = pContact->GetMaster()->GetOrdNum();
bFnd = true;
}
}
@@ -72,17 +72,17 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const
SwFrameFormat* pFormat,
if( !bFnd )
{
- nOrdNum = pFormat->GetDoc()->GetSpzFrameFormats()->size();
- nOrdNum += nArrPos;
+ m_nOrdNum = pFormat->GetDoc()->GetSpzFrameFormats()->size();
+ m_nOrdNum += nArrPos;
}
}
SwPosFlyFrm::~SwPosFlyFrm()
{
- const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+ const SwFormatAnchor& rAnchor = m_pFrameFormat->GetAnchor();
if (FLY_AT_PAGE == rAnchor.GetAnchorId())
{
- delete pNdIdx;
+ delete m_pNodeIndex;
}
}
commit 82acd281d3326ea051a7ea2dd24af2f93981abf4
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Oct 29 08:34:09 2015 +0100
sw: prefix members of SwStartNode
Change-Id: Ibb3b33681f4c33794e07b40989709e8f292f2084
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 9d07024..2bb668d 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -303,8 +303,8 @@ class SwStartNode: public SwNode
friend class SwNodes;
friend class SwEndNode; ///< to set the theEndOfSection !!
- SwEndNode* pEndOfSection;
- SwStartNodeType eSttNdTyp;
+ SwEndNode* m_pEndOfSection;
+ SwStartNodeType m_eStartNodeType;
/// for the initial StartNode
SwStartNode( SwNodes& rNodes, sal_uLong nPos );
@@ -316,7 +316,7 @@ protected:
public:
DECL_FIXEDMEMPOOL_NEWDEL(SwStartNode)
- SwStartNodeType GetStartNodeType() const { return eSttNdTyp; }
+ SwStartNodeType GetStartNodeType() const { return m_eStartNodeType;
}
/// Call ChkCondcoll to all ContentNodes of section.
void CheckSectionCondColl() const;
@@ -684,17 +684,17 @@ inline sal_uLong SwNode::StartOfSectionIndex() const
inline sal_uLong SwNode::EndOfSectionIndex() const
{
const SwStartNode* pStNd = IsStartNode() ? static_cast<const
SwStartNode*>(this) : pStartOfSection;
- return pStNd->pEndOfSection->GetIndex();
+ return pStNd->m_pEndOfSection->GetIndex();
}
inline const SwEndNode* SwNode::EndOfSectionNode() const
{
const SwStartNode* pStNd = IsStartNode() ? static_cast<const
SwStartNode*>(this) : pStartOfSection;
- return pStNd->pEndOfSection;
+ return pStNd->m_pEndOfSection;
}
inline SwEndNode* SwNode::EndOfSectionNode()
{
const SwStartNode* pStNd = IsStartNode() ? static_cast<const
SwStartNode*>(this) : pStartOfSection;
- return pStNd->pEndOfSection;
+ return pStNd->m_pEndOfSection;
}
inline SwNodes& SwNode::GetNodes()
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 66713a2..250bf3b 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -3415,7 +3415,7 @@ SwTableNode* SwNodes::SplitTable( const SwNodeIndex&
rPos, bool bAfter,
pNewTableNd->GetTable().SetTableModel( rTable.IsNewModel() );
pOldTableEndNd->pStartOfSection = pNewTableNd;
- pNewTableNd->pEndOfSection = pOldTableEndNd;
+ pNewTableNd->m_pEndOfSection = pOldTableEndNd;
SwNode* pBoxNd = aIdx.GetNode().GetStartNode();
do {
@@ -3615,7 +3615,7 @@ bool SwNodes::MergeTable( const SwNodeIndex& rPos, bool
bWithPrev,
// The preceding Table always remains, while the succeeding one is deleted
SwEndNode* pTableEndNd = pDelTableNd->EndOfSectionNode();
- pTableNd->pEndOfSection = pTableEndNd;
+ pTableNd->m_pEndOfSection = pTableEndNd;
SwNodeIndex aIdx( *pDelTableNd, 1 );
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index e4f7d5a..3a1f2e8 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -879,7 +879,7 @@ void SwNode::dumpAsXml(xmlTextWriterPtr pWriter) const
SwStartNode::SwStartNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
SwStartNodeType eSttNd )
- : SwNode( rWhere, nNdType ), eSttNdTyp( eSttNd )
+ : SwNode( rWhere, nNdType ), m_eStartNodeType( eSttNd )
{
if( !rWhere.GetIndex() )
{
@@ -888,11 +888,11 @@ SwStartNode::SwStartNode( const SwNodeIndex &rWhere,
const sal_uInt8 nNdType,
pStartOfSection = this;
}
// Just do this temporarily until the EndNode is inserted
- pEndOfSection = reinterpret_cast<SwEndNode*>(this);
+ m_pEndOfSection = reinterpret_cast<SwEndNode*>(this);
}
SwStartNode::SwStartNode( SwNodes& rNodes, sal_uLong nPos )
- : SwNode( rNodes, nPos, ND_STARTNODE ), eSttNdTyp( SwNormalStartNode )
+ : SwNode( rNodes, nPos, ND_STARTNODE ), m_eStartNodeType(
SwNormalStartNode )
{
if( !nPos )
{
@@ -900,7 +900,7 @@ SwStartNode::SwStartNode( SwNodes& rNodes, sal_uLong nPos )
pStartOfSection = this;
}
// Just do this temporarily until the EndNode is inserted
- pEndOfSection = reinterpret_cast<SwEndNode*>(this);
+ m_pEndOfSection = reinterpret_cast<SwEndNode*>(this);
}
void SwStartNode::CheckSectionCondColl() const
@@ -981,14 +981,14 @@ SwEndNode::SwEndNode( const SwNodeIndex &rWhere,
SwStartNode& rSttNd )
: SwNode( rWhere, ND_ENDNODE )
{
pStartOfSection = &rSttNd;
- pStartOfSection->pEndOfSection = this;
+ pStartOfSection->m_pEndOfSection = this;
}
SwEndNode::SwEndNode( SwNodes& rNds, sal_uLong nPos, SwStartNode& rSttNd )
: SwNode( rNds, nPos, ND_ENDNODE )
{
pStartOfSection = &rSttNd;
- pStartOfSection->pEndOfSection = this;
+ pStartOfSection->m_pEndOfSection = this;
}
SwContentNode::SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8
nNdType,
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 2061939..b82a3c2 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -562,7 +562,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange,
SwNodes & rNodes,
pSttNode = static_cast<SwStartNode*>(pNd);
else if( pNd->IsEndNode() )
{
- pSttNode->pEndOfSection =
static_cast<SwEndNode*>(pNd);
+ pSttNode->m_pEndOfSection =
static_cast<SwEndNode*>(pNd);
if( pSttNode->IsSectionNode() )
static_cast<SwSectionNode*>(pSttNode)->NodesArrChgd();
pSttNode = pSttNode->pStartOfSection;
@@ -662,7 +662,7 @@ bool SwNodes::_MoveNodes( const SwNodeRange& aRange,
SwNodes & rNodes,
rNodes.InsertNode( pSttNd, aIdx );
rNodes.InsertNode( pAktNode, aIdx );
--aIdx;
- pSttNd->pEndOfSection = static_cast<SwEndNode*>(pAktNode);
+ pSttNd->m_pEndOfSection =
static_cast<SwEndNode*>(pAktNode);
--aRg.aEnd;
@@ -1045,7 +1045,7 @@ void SwNodes::SectionUpDown( const SwNodeIndex & aStart,
const SwNodeIndex & aEn
else if( pAktNode->GetEndNode() )
{
SwStartNode* pSttNd = aSttNdStack[ aSttNdStack.size() - 1 ];
- pSttNd->pEndOfSection = static_cast<SwEndNode*>(pAktNode);
+ pSttNd->m_pEndOfSection = static_cast<SwEndNode*>(pAktNode);
aSttNdStack.pop_back();
if( !aSttNdStack.empty() )
continue; // still enough EndNodes on the stack
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
