summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/node.hxx12
-rw-r--r--sw/source/core/docnode/ndtbl.cxx4
-rw-r--r--sw/source/core/docnode/node.cxx12
-rw-r--r--sw/source/core/docnode/nodes.cxx6
4 files changed, 17 insertions, 17 deletions
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 9d070245f79d..2bb668d49c64 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 66713a22fc96..250bf3bfd725 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 e4f7d5a21de7..3a1f2e80f30f 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 20619399a78a..b82a3c221631 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
generated by cgit (git 2.34.1) at 2025-01-10 11:11:39 +0000