sw/inc/node.hxx | 18 +++++++++---------
sw/source/core/crsr/trvltbl.cxx | 4 ++--
sw/source/core/docnode/ndtbl.cxx | 2 +-
sw/source/core/docnode/node.cxx | 2 +-
sw/source/core/undo/untbl.cxx | 4 ++--
sw/source/core/unocore/unoframe.cxx | 4 ++--
sw/source/core/unocore/unoobj.cxx | 4 ++--
sw/source/core/unocore/unoobj2.cxx | 4 ++--
sw/source/core/unocore/unoredline.cxx | 2 +-
sw/source/core/unocore/unotext.cxx | 14 +++++++-------
sw/source/uibase/uno/unotxvw.cxx | 4 ++--
11 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 634062aef12161bbec164e3aaed7fbe37618cd68
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Dec 23 16:28:52 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Dec 23 19:49:30 2024 +0100
sw: FindSttNodeByType -> FindStartNodeByType
Change-Id: I37dbe6583ef121fbb2439d413eaa6bcad9d07f73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179257
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Tested-by: Jenkins
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index dd16cff8c7a8..12a156908136 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -214,19 +214,19 @@ public:
SwSectionNode *FindSectionNode();
inline const SwSectionNode *FindSectionNode() const;
- SwStartNode* FindSttNodeByType( SwStartNodeType eTyp );
- inline const SwStartNode* FindSttNodeByType( SwStartNodeType eTyp ) const;
+ SwStartNode* FindStartNodeByType( SwStartNodeType eTyp );
+ inline const SwStartNode* FindStartNodeByType( SwStartNodeType eTyp )
const;
const SwStartNode* FindTableBoxStartNode() const
- { return FindSttNodeByType( SwTableBoxStartNode ); }
+ { return FindStartNodeByType( SwTableBoxStartNode ); }
const SwStartNode* FindFlyStartNode() const
- { return FindSttNodeByType( SwFlyStartNode ); }
+ { return FindStartNodeByType( SwFlyStartNode ); }
const SwStartNode* FindFootnoteStartNode() const
- { return FindSttNodeByType( SwFootnoteStartNode ); }
+ { return FindStartNodeByType( SwFootnoteStartNode ); }
const SwStartNode* FindHeaderStartNode() const
- { return FindSttNodeByType( SwHeaderStartNode ); }
+ { return FindStartNodeByType( SwHeaderStartNode ); }
const SwStartNode* FindFooterStartNode() const
- { return FindSttNodeByType( SwFooterStartNode ); }
+ { return FindStartNodeByType( SwFooterStartNode ); }
/// Node is in which nodes-array/doc?
inline SwNodes& GetNodes();
@@ -674,9 +674,9 @@ inline const SwContentNode *SwNode::GetContentNode() const
return IsContentNode() ? static_cast<const SwContentNode*>(this) :
nullptr;
}
-inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp )
const
+inline const SwStartNode* SwNode::FindStartNodeByType( SwStartNodeType eTyp )
const
{
- return const_cast<SwNode*>(this)->FindSttNodeByType( eTyp );
+ return const_cast<SwNode*>(this)->FindStartNodeByType( eTyp );
}
inline const SwTableNode* SwNode::FindTableNode() const
{
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 898024771dba..c7390b7de1b8 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -819,7 +819,7 @@ bool SwCursorShell::CheckTableBoxContent( const SwPosition*
pPos )
}
else
{
- pSttNd = pPos->GetNode().FindSttNodeByType( SwTableBoxStartNode );
+ pSttNd = pPos->GetNode().FindStartNodeByType( SwTableBoxStartNode );
if( pSttNd)
pChkBox = pSttNd->FindTableNode()->GetTable().GetTableBox(
pSttNd->GetIndex() );
}
@@ -871,7 +871,7 @@ void SwCursorShell::SaveTableBoxContent( const SwPosition*
pPos )
if( !pPos )
pPos = m_pCurrentCursor->GetPoint();
- SwStartNode* pSttNd = pPos->GetNode().FindSttNodeByType(
SwTableBoxStartNode );
+ SwStartNode* pSttNd = pPos->GetNode().FindStartNodeByType(
SwTableBoxStartNode );
bool bCheckBox = false;
if( pSttNd && m_pBoxIdx )
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 51e785f665fe..feb300507db2 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4293,7 +4293,7 @@ void SwDoc::ClearLineNumAttrs( SwPosition const & rPos )
void SwDoc::ClearBoxNumAttrs( SwNode& rNode )
{
- SwStartNode* pSttNd = rNode.FindSttNodeByType( SwTableBoxStartNode );
+ SwStartNode* pSttNd = rNode.FindStartNodeByType( SwTableBoxStartNode );
if( nullptr == pSttNd ||
SwNodeOffset(2) != pSttNd->EndOfSectionIndex() - pSttNd->GetIndex())
return;
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index d32e717ea90a..8fb992d28f40 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -785,7 +785,7 @@ SwTableBox* SwNode::GetTableBox() const
return pBox;
}
-SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp )
+SwStartNode* SwNode::FindStartNodeByType( SwStartNodeType eTyp )
{
SwStartNode* pTmp = IsStartNode() ? static_cast<SwStartNode*>(this) :
m_pStartOfSection;
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index c037c4c2b34f..cbfa86b44cf4 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -2133,7 +2133,7 @@ void SwUndoTableNumFormat::UndoImpl(::sw::UndoRedoContext
& rContext)
SwDoc & rDoc = rContext.GetDoc();
SwStartNode* pSttNd = rDoc.GetNodes()[ m_nNode ]->
- FindSttNodeByType( SwTableBoxStartNode );
+ FindStartNodeByType( SwTableBoxStartNode );
assert(pSttNd && "without StartNode no TableBox");
SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().GetTableBox(
pSttNd->GetIndex() );
@@ -2234,7 +2234,7 @@ void SwUndoTableNumFormat::RedoImpl(::sw::UndoRedoContext
& rContext)
pPam->GetPoint()->Assign( m_nNode );
SwNode * pNd = & pPam->GetPoint()->GetNode();
- SwStartNode* pSttNd = pNd->FindSttNodeByType( SwTableBoxStartNode );
+ SwStartNode* pSttNd = pNd->FindStartNodeByType( SwTableBoxStartNode );
assert(pSttNd && "without StartNode no TableBox");
SwTableBox* pBox = pSttNd->FindTableNode()->GetTable().GetTableBox(
pSttNd->GetIndex() );
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 0d17f192d40f..979c7fce353c 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3206,7 +3206,7 @@ rtl::Reference<SwXTextCursor>
SwXTextFrame::createXTextCursor()
//save current start node to be able to check if there is content after
the table -
//otherwise the cursor would be in the body text!
const SwNode& rNode = pFormat->GetContent().GetContentIdx()->GetNode();
- const SwStartNode* pOwnStartNode = rNode.FindSttNodeByType(SwFlyStartNode);
+ const SwStartNode* pOwnStartNode =
rNode.FindStartNodeByType(SwFlyStartNode);
SwPaM aPam(rNode);
aPam.Move(fnMoveForward, GoInNode);
@@ -3219,7 +3219,7 @@ rtl::Reference<SwXTextCursor>
SwXTextFrame::createXTextCursor()
}
const SwStartNode* pNewStartNode =
- aPam.GetPointNode().FindSttNodeByType(SwFlyStartNode);
+ aPam.GetPointNode().FindStartNodeByType(SwFlyStartNode);
if(!pNewStartNode || pNewStartNode != pOwnStartNode)
{
throw uno::RuntimeException(u"no text available"_ustr);
diff --git a/sw/source/core/unocore/unoobj.cxx
b/sw/source/core/unocore/unoobj.cxx
index 0d7b29bf9ccf..2333a641b90b 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1212,7 +1212,7 @@ SwXTextCursor::gotoRangeImpl(
;
}
- const SwStartNode* pOwnStartNode =
rOwnCursor.GetPointNode().FindSttNodeByType(eSearchNodeType);
+ const SwStartNode* pOwnStartNode =
rOwnCursor.GetPointNode().FindStartNodeByType(eSearchNodeType);
while ( pOwnStartNode != nullptr
&& pOwnStartNode->IsSectionNode())
{
@@ -1220,7 +1220,7 @@ SwXTextCursor::gotoRangeImpl(
}
const SwStartNode* pTmp =
- pPam->GetPointNode().FindSttNodeByType(eSearchNodeType);
+ pPam->GetPointNode().FindStartNodeByType(eSearchNodeType);
while ( pTmp != nullptr
&& pTmp->IsSectionNode() )
{
diff --git a/sw/source/core/unocore/unoobj2.cxx
b/sw/source/core/unocore/unoobj2.cxx
index d2910db91710..5875a17c8e90 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -1249,7 +1249,7 @@ lcl_IsStartNodeInFormat(const bool bHeader, SwStartNode
const *const pSttNode,
if ( !rFlyContent.GetContentIdx() )
return false;
const SwNode& rNode = rFlyContent.GetContentIdx()->GetNode();
- SwStartNode const*const pCurSttNode = rNode.FindSttNodeByType(
+ SwStartNode const*const pCurSttNode = rNode.FindStartNodeByType(
bHeader ? SwHeaderStartNode : SwFooterStartNode);
if (pCurSttNode && (pCurSttNode == pSttNode))
{
@@ -1361,7 +1361,7 @@ CreateParentXText(SwDoc & rDoc, const SwPosition& rPos)
const SwFormatFootnote& rFormatFootnote =
pTextFootnote->GetFootnote();
assert(pTextFootnote == rFormatFootnote.GetTextFootnote());
assert(&pTextFootnote->GetStartNode()->GetNode() ==
pTextFootnote->GetStartNode()->GetNode().
- FindSttNodeByType(SwFootnoteStartNode));
+ FindStartNodeByType(SwFootnoteStartNode));
if (pSttNode == &pTextFootnote->GetStartNode()->GetNode())
{
diff --git a/sw/source/core/unocore/unoredline.cxx
b/sw/source/core/unocore/unoredline.cxx
index 414bebbc1056..31cbaf2f86c7 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -115,7 +115,7 @@ rtl::Reference< SwXTextCursor >
SwXRedlineText::createXTextCursor()
SwContentNode* pContentNode = SwNodes::GoNext(rUnoCursor.GetPoint());
pTableNode = pContentNode->FindTableNode();
}
- if( bTable && rUnoCursor.GetPointNode().FindSttNodeByType(
SwNormalStartNode )
+ if( bTable && rUnoCursor.GetPointNode().FindStartNodeByType(
SwNormalStartNode )
!= GetStartNode() )
{
// We have gone too far and have left our own redline. This means that
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index 0f932b244a9b..c4a72376d5c3 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -483,7 +483,7 @@ SwXText::insertTextContent(
}
const SwStartNode* pTmp =
- aPam.GetPointNode().FindSttNodeByType(eSearchNodeType);
+ aPam.GetPointNode().FindStartNodeByType(eSearchNodeType);
// ignore SectionNodes
while (pTmp && pTmp->IsSectionNode())
@@ -880,7 +880,7 @@ bool SwXText::CheckForOwnMember(const SwPaM & rPaM)
}
const SwNode& rSrcNode = rPaM.GetPointNode();
- const SwStartNode* pTmp = rSrcNode.FindSttNodeByType(eSearchNodeType);
+ const SwStartNode* pTmp = rSrcNode.FindStartNodeByType(eSearchNodeType);
// skip SectionNodes / TableNodes to be able to compare across
table/section boundaries
while (pTmp
@@ -1762,7 +1762,7 @@ SwXText::convertToTextFrame(
else
{
// In case the frame has a table only, the cursor points to
the end of the first cell of the table.
- SwPaM
aPaM(*xFrameTextCursor->GetPaM()->GetPointNode().FindSttNodeByType(SwFlyStartNode)->EndOfSectionNode());
+ SwPaM
aPaM(*xFrameTextCursor->GetPaM()->GetPointNode().FindStartNodeByType(SwFlyStartNode)->EndOfSectionNode());
// Now we have the end of the frame -- the node before that
will be the paragraph we want to remove.
aPaM.GetPoint()->Adjust(SwNodeOffset(-1));
m_pDoc->getIDocumentContentOperations().DelFullPara(aPaM);
@@ -2657,7 +2657,7 @@ rtl::Reference<SwXTextCursor>
SwXHeadFootText::CreateTextCursor(const bool bIgno
// save current start node to be able to check if there is content
// after the table - otherwise the cursor would be in the body text!
- SwStartNode const*const pOwnStartNode = rNode.FindSttNodeByType(
+ SwStartNode const*const pOwnStartNode = rNode.FindStartNodeByType(
(m_pImpl->m_bIsHeader) ? SwHeaderStartNode : SwFooterStartNode);
if (!bIgnoreTables)
@@ -2671,7 +2671,7 @@ rtl::Reference<SwXTextCursor>
SwXHeadFootText::CreateTextCursor(const bool bIgno
pTableNode = pCont->FindTableNode();
}
}
- SwStartNode const*const pNewStartNode =
rUnoCursor.GetPointNode().FindSttNodeByType(
+ SwStartNode const*const pNewStartNode =
rUnoCursor.GetPointNode().FindStartNodeByType(
(m_pImpl->m_bIsHeader) ? SwHeaderStartNode : SwFooterStartNode);
if (!pNewStartNode || (pNewStartNode != pOwnStartNode))
{
@@ -2706,9 +2706,9 @@ rtl::Reference< SwXTextCursor >
SwXHeadFootText::createXTextCursorByRangeImpl(
SwPosition aPos(rNode);
SwPaM aHFPam(aPos);
aHFPam.Move(fnMoveForward, GoInNode);
- SwStartNode* const pOwnStartNode = aHFPam.GetPointNode().FindSttNodeByType(
+ SwStartNode* const pOwnStartNode =
aHFPam.GetPointNode().FindStartNodeByType(
(m_pImpl->m_bIsHeader) ? SwHeaderStartNode : SwFooterStartNode);
- SwStartNode* const p1 = rPam.GetPointNode().FindSttNodeByType(
+ SwStartNode* const p1 = rPam.GetPointNode().FindStartNodeByType(
(m_pImpl->m_bIsHeader) ? SwHeaderStartNode : SwFooterStartNode);
if (p1 == pOwnStartNode)
{
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 05e39532ad3f..c3af453f16a7 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -1004,7 +1004,7 @@ void SwXTextViewCursor::gotoRange(
eSearchNodeType = SwFootnoteStartNode;
const SwStartNode* pOwnStartNode = aOwnPaM.GetPointNode().
- FindSttNodeByType(eSearchNodeType);
+
FindStartNodeByType(eSearchNodeType);
const SwNode* pSrcNode = nullptr;
if(pCursor && pCursor->GetPaM())
@@ -1023,7 +1023,7 @@ void SwXTextViewCursor::gotoRange(
{
pSrcNode = pPara->GetTextNode();
}
- const SwStartNode* pTmp = pSrcNode ?
pSrcNode->FindSttNodeByType(eSearchNodeType) : nullptr;
+ const SwStartNode* pTmp = pSrcNode ?
pSrcNode->FindStartNodeByType(eSearchNodeType) : nullptr;
//Skip SectionNodes
while(pTmp && pTmp->IsSectionNode())
