sw/inc/ndarr.hxx | 4 ++-- sw/source/core/docnode/nodes.cxx | 25 ++++++++----------------- 2 files changed, 10 insertions(+), 19 deletions(-)
New commits: commit 2165f174f131933ad4abe530d79ca87728439824 Author: Michael Stahl <[email protected]> AuthorDate: Tue Dec 21 13:52:56 2021 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Wed Dec 22 17:05:27 2021 +0100 sw: simplify SwNodes::FindPrvNxtFrameNode(), pEnd is always passed Change-Id: I6bd606e8c70704cb716b1eb474934dedb54d81da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127270 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit e0f13ce0f9e2dac836c42141bb848d2bf4fbda75) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127250 diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index 5393af72e776..28c96cc8a249 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -301,8 +301,8 @@ public: const SwDoc& GetDoc() const { return m_rMyDoc; } /** Search previous / next content node or table node with frames. - If no end is given begin with the FrameIndex, else start search - with that before rFrameIdx and pEnd at the back. + Search is started backward with the one before rFrameIdx and + forward after pEnd. If no valid node is found, return 0. rFrameIdx points to the node with frames. **/ SwNode* FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, const SwNode* pEnd ) const; diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 1b16c73b46eb..9ee61dd93d50 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -2027,8 +2027,7 @@ SwContentNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx, /** find the next/previous ContentNode or table node that should have layout * frames that are siblings to the ones of the node at rFrameIdx. * - * If no pEnd is given, search is started with FrameIndex; otherwise - * search is started backward with the one before rFrameIdx and + * Search is started backward with the one before rFrameIdx and * forward after pEnd. * * @param rFrameIdx in: node with frames to search in; out: found node @@ -2038,6 +2037,8 @@ SwContentNode* SwNodes::GoPrevSection( SwNodeIndex * pIdx, SwNode* SwNodes::FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, const SwNode* pEnd ) const { + assert(pEnd != nullptr); // every caller currently + SwNode* pFrameNd = nullptr; // no layout -> skip @@ -2057,12 +2058,8 @@ SwNode* SwNodes::FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, ? pSttNd->StartOfSectionNode()->FindTableNode() : pSttNd->FindTableNode(); SwNodeIndex aIdx( rFrameIdx ); - SwNode* pNd; - if( pEnd ) - { - --aIdx; - } - pNd = &aIdx.GetNode(); + --aIdx; + SwNode *const pNd = &aIdx.GetNode(); if( ( pFrameNd = pNd )->IsContentNode() ) rFrameIdx = aIdx; @@ -2083,13 +2080,10 @@ SwNode* SwNodes::FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, } else { - if( pEnd ) - aIdx = pEnd->GetIndex() + 1; - else - aIdx = rFrameIdx; + aIdx = pEnd->GetIndex() + 1; // NEVER leave the section when doing this! - if( ( pEnd && ( pFrameNd = &aIdx.GetNode())->IsContentNode() ) || + if( ( ( pFrameNd = &aIdx.GetNode())->IsContentNode() ) || ( nullptr != ( pFrameNd = GoNextSection( &aIdx, true, false )) && ::CheckNodesRange( aIdx, rFrameIdx, true ) && ( pFrameNd->FindTableNode() == pTableNd && @@ -2122,10 +2116,7 @@ SwNode* SwNodes::FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, } else { - if( pEnd ) - aIdx = pEnd->GetIndex() + 1; - else - aIdx = rFrameIdx.GetIndex() + 1; + aIdx = pEnd->GetIndex() + 1; if( (pFrameNd = &aIdx.GetNode())->IsTableNode() ) rFrameIdx = aIdx;
