summaryrefslogtreecommitdiff
path: root/sw/source/core/docnode/nodes.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/docnode/nodes.cxx')
-rw-r--r--sw/source/core/docnode/nodes.cxx64
1 files changed, 32 insertions, 32 deletions
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index 1e0b282cfe43..c9f0b8192dcd 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -414,7 +414,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
SwNodeRange aRg( aRange );
// skip "simple" start or end nodes
- while( ND_STARTNODE == (pAktNode = &aRg.aStart.GetNode())->GetNodeType()
+ while( SwNodeType::Start == (pAktNode = &aRg.aStart.GetNode())->GetNodeType()
|| ( pAktNode->IsEndNode() &&
!pAktNode->m_pStartOfSection->IsSectionNode() ) )
++aRg.aStart;
@@ -425,7 +425,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
while( ( (( pAktNode = &aRg.aEnd.GetNode())->GetStartNode() &&
!pAktNode->IsSectionNode() ) ||
( pAktNode->IsEndNode() &&
- ND_STARTNODE == pAktNode->m_pStartOfSection->GetNodeType()) ) &&
+ SwNodeType::Start == pAktNode->m_pStartOfSection->GetNodeType()) ) &&
aRg.aEnd > aRg.aStart )
--aRg.aEnd;
@@ -463,7 +463,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
while( aRg.aStart < aRg.aEnd )
switch( (pAktNode = &aRg.aEnd.GetNode())->GetNodeType() )
{
- case ND_ENDNODE:
+ case SwNodeType::End:
{
if( nInsPos ) // move everything until here
{
@@ -607,7 +607,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
{
// create StartNode and EndNode at InsertPos
SwStartNode* pTmp = new SwStartNode( aIdx,
- ND_STARTNODE,
+ SwNodeType::Start,
/*?? NodeType ??*/ SwNormalStartNode );
nLevel++; // put the index to StartNode on the stack
@@ -678,7 +678,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
}
break;
- case ND_SECTIONNODE:
+ case SwNodeType::Section:
if( !nLevel &&
GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(rNodes))
{
@@ -698,8 +698,8 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
break;
}
SAL_FALLTHROUGH;
- case ND_TABLENODE:
- case ND_STARTNODE:
+ case SwNodeType::Table:
+ case SwNodeType::Start:
{
// empty section -> nothing to do
// and only if it's a top level section
@@ -714,7 +714,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
// create decrease
SwNodeIndex aTmpSIdx( aOrigInsPos.aStart, 1 );
SwStartNode* pTmpStt = new SwStartNode( aTmpSIdx,
- ND_STARTNODE,
+ SwNodeType::Start,
static_cast<SwStartNode*>(pAktNode)->GetStartNodeType() );
--aTmpSIdx;
@@ -780,7 +780,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
// delete all resulting empty start/end node pairs
SwNode* pTmpNode = (*this)[ aRg.aEnd.GetIndex()+1 ]->GetEndNode();
- if( pTmpNode && ND_STARTNODE == (pAktNode = &aRg.aEnd.GetNode())
+ if( pTmpNode && SwNodeType::Start == (pAktNode = &aRg.aEnd.GetNode())
->GetNodeType() && pAktNode->StartOfSectionIndex() &&
pTmpNode->StartOfSectionNode() == pAktNode )
{
@@ -790,7 +790,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
}
break;
- case ND_TEXTNODE:
+ case SwNodeType::Text:
//Add special function to text node.
{
if( bNewFrames && pAktNode->GetContentNode() )
@@ -800,8 +800,8 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
--aRg.aEnd;
}
break;
- case ND_GRFNODE:
- case ND_OLENODE:
+ case SwNodeType::Grf:
+ case SwNodeType::Ole:
{
if( bNewFrames && pAktNode->GetContentNode() )
static_cast<SwContentNode*>(pAktNode)->DelFrames();
@@ -812,7 +812,7 @@ bool SwNodes::MoveNodes( const SwNodeRange& aRange, SwNodes & rNodes,
}
break;
- case ND_PLACEHOLDER:
+ case SwNodeType::PlaceHolder:
if (GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(*this))
{
if( &rNodes == this ) // inside UndoNodesArray
@@ -917,7 +917,7 @@ void SwNodes::SectionDown(SwNodeRange *pRange, SwStartNodeType eSttNdTyp )
else
{
// insert a new StartNode
- SwNode* pSttNd = new SwStartNode( pRange->aStart, ND_STARTNODE, eSttNdTyp );
+ SwNode* pSttNd = new SwStartNode( pRange->aStart, SwNodeType::Start, eSttNdTyp );
pRange->aStart = *pSttNd;
aTmpIdx = pRange->aStart;
}
@@ -1689,7 +1689,7 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
SwNodeRange aRg( rRange );
// skip "simple" StartNodes or EndNodes
- while( ND_STARTNODE == (pAktNode = & aRg.aStart.GetNode())->GetNodeType()
+ while( SwNodeType::Start == (pAktNode = & aRg.aStart.GetNode())->GetNodeType()
|| ( pAktNode->IsEndNode() &&
!pAktNode->m_pStartOfSection->IsSectionNode() ) )
++aRg.aStart;
@@ -1709,7 +1709,7 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
while( ((pAktNode = & aRg.aEnd.GetNode())->GetStartNode() &&
!pAktNode->IsSectionNode() ) ||
( pAktNode->IsEndNode() &&
- ND_STARTNODE == pAktNode->m_pStartOfSection->GetNodeType()) )
+ SwNodeType::Start == pAktNode->m_pStartOfSection->GetNodeType()) )
{
--aRg.aEnd;
}
@@ -1741,7 +1741,7 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
pAktNode = &aRg.aStart.GetNode();
switch( pAktNode->GetNodeType() )
{
- case ND_TABLENODE:
+ case SwNodeType::Table:
// Does it copy a table in(to) a footnote?
if( aInsPos < pDoc->GetNodes().GetEndOfInserts().GetIndex() &&
pDoc->GetNodes().GetEndOfInserts().StartOfSectionIndex()
@@ -1804,7 +1804,7 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
}
break;
- case ND_SECTIONNODE:
+ case SwNodeType::Section:
// If the end of the section is outside the copy range,
// the section node will skipped, not copied!
// If someone want to change this behaviour, he has to adjust the function
@@ -1829,9 +1829,9 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
}
break;
- case ND_STARTNODE:
+ case SwNodeType::Start:
{
- SwStartNode* pTmp = new SwStartNode( aInsPos, ND_STARTNODE,
+ SwStartNode* pTmp = new SwStartNode( aInsPos, SwNodeType::Start,
static_cast<SwStartNode*>(pAktNode)->GetStartNodeType() );
new SwEndNode( aInsPos, *pTmp );
--aInsPos;
@@ -1839,7 +1839,7 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
}
break;
- case ND_ENDNODE:
+ case SwNodeType::End:
if( nLevel ) // complete section
{
--nLevel;
@@ -1857,9 +1857,9 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
}
break;
- case ND_TEXTNODE:
- case ND_GRFNODE:
- case ND_OLENODE:
+ case SwNodeType::Text:
+ case SwNodeType::Grf:
+ case SwNodeType::Ole:
{
SwContentNode* pNew = static_cast<SwContentNode*>(pAktNode)->MakeCopy(
pDoc, aInsPos );
@@ -1869,7 +1869,7 @@ void SwNodes::CopyNodes( const SwNodeRange& rRange,
}
break;
- case ND_PLACEHOLDER:
+ case SwNodeType::PlaceHolder:
if (GetDoc()->GetIDocumentUndoRedo().IsUndoNodes(*this))
{
// than a SectionNode (start/end) is needed at the current
@@ -1896,7 +1896,7 @@ void SwNodes::DelDummyNodes( const SwNodeRange& rRg )
SwNodeIndex aIdx( rRg.aStart );
while( aIdx.GetIndex() < rRg.aEnd.GetIndex() )
{
- if (ND_PLACEHOLDER == aIdx.GetNode().GetNodeType())
+ if (SwNodeType::PlaceHolder == aIdx.GetNode().GetNodeType())
RemoveNode( aIdx.GetIndex(), 1, true );
else
++aIdx;
@@ -1906,7 +1906,7 @@ void SwNodes::DelDummyNodes( const SwNodeRange& rRg )
SwStartNode* SwNodes::MakeEmptySection( const SwNodeIndex& rIdx,
SwStartNodeType eSttNdTyp )
{
- SwStartNode* pSttNd = new SwStartNode( rIdx, ND_STARTNODE, eSttNdTyp );
+ SwStartNode* pSttNd = new SwStartNode( rIdx, SwNodeType::Start, eSttNdTyp );
new SwEndNode( rIdx, *pSttNd );
return pSttNd;
}
@@ -1915,7 +1915,7 @@ SwStartNode* SwNodes::MakeTextSection( const SwNodeIndex & rWhere,
SwStartNodeType eSttNdTyp,
SwTextFormatColl *pColl )
{
- SwStartNode* pSttNd = new SwStartNode( rWhere, ND_STARTNODE, eSttNdTyp );
+ SwStartNode* pSttNd = new SwStartNode( rWhere, SwNodeType::Start, eSttNdTyp );
new SwEndNode( rWhere, *pSttNd );
MakeTextNode( SwNodeIndex( rWhere, - 1 ), pColl );
return pSttNd;
@@ -1943,7 +1943,7 @@ SwContentNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
while( aTmp < Count() - 1 )
{
pNd = & aTmp.GetNode();
- if (ND_SECTIONNODE == pNd->GetNodeType())
+ if (SwNodeType::Section == pNd->GetNodeType())
{
const SwSection& rSect = static_cast<const SwSectionNode*>(pNd)->GetSection();
if( (bSkipHidden && rSect.IsHiddenFlag()) ||
@@ -1963,7 +1963,7 @@ SwContentNode* SwNodes::GoNextSection( SwNodeIndex * pIdx,
aTmp = *pNd->EndOfSectionNode();
}
}
- else if( ND_CONTENTNODE & pNd->GetNodeType() )
+ else if( SwNodeType::ContentMask & pNd->GetNodeType() )
{
const SwSectionNode* pSectNd;
if( ( bSkipHidden || bSkipProtect ) &&
@@ -1995,7 +1995,7 @@ SwContentNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
while( aTmp > 0 )
{
pNd = & aTmp.GetNode();
- if (ND_ENDNODE == pNd->GetNodeType())
+ if (SwNodeType::End == pNd->GetNodeType())
{
if( pNd->m_pStartOfSection->IsSectionNode() )
{
@@ -2021,7 +2021,7 @@ SwContentNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx,
aTmp = *pNd->StartOfSectionNode();
}
}
- else if( ND_CONTENTNODE & pNd->GetNodeType() )
+ else if( SwNodeType::ContentMask & pNd->GetNodeType() )
{
const SwSectionNode* pSectNd;
if( ( bSkipHidden || bSkipProtect ) &&
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 00:21:25 +0000