sw/inc/pam.hxx | 2 +- sw/source/core/crsr/crsrsh.cxx | 6 +++--- sw/source/core/crsr/pam.cxx | 8 ++++---- sw/source/core/crsr/swcrsr.cxx | 12 ++++++------ sw/source/core/doc/docbm.cxx | 2 +- sw/source/core/docnode/ndsect.cxx | 8 ++++---- sw/source/core/docnode/node2lay.cxx | 4 ++-- sw/source/core/docnode/nodes.cxx | 10 +++++----- sw/source/filter/basflt/fltshell.cxx | 8 ++++---- sw/source/filter/xml/XMLRedlineImportHelper.cxx | 4 ++-- 10 files changed, 32 insertions(+), 32 deletions(-)
New commits: commit 7fba323df141be9eddbce39bec0c0f7ee412a7f7 Author: Noel Grandin <[email protected]> AuthorDate: Fri Aug 5 15:56:13 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Aug 6 09:10:42 2022 +0200 make CheckNodesRange take a SwNode, not an SwNodeIndex as part of the process of hiding the internals of SwPosition Change-Id: If8e9426df4b78ebf95bbac54ebfdcff4b19b6292 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137874 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 60675cd2aa33..86e4b6fb5226 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -329,7 +329,7 @@ public: SW_DLLPUBLIC std::ostream &operator <<(std::ostream& s, const SwPaM& pam); -bool CheckNodesRange(const SwNodeIndex&, const SwNodeIndex&, bool bChkSection); +bool CheckNodesRange(const SwNode&, const SwNode&, bool bChkSection); #endif // INCLUDED_SW_INC_PAM_HXX diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 99840a2494dc..63cce668c13e 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -837,7 +837,7 @@ int SwCursorShell::SetCursor( const Point &rLPt, bool bOnlyText, bool bBlock ) else { // SSelection over not allowed sections or if in header/footer -> different - if( !CheckNodesRange( aPos.nNode, pCursor->GetMark()->nNode, true ) + if( !CheckNodesRange( aPos.GetNode(), pCursor->GetMark()->GetNode(), true ) || ( pFrame && !pFrame->getFrameArea().Contains( pCursor->GetMkPos() ) )) return bRet; @@ -2343,8 +2343,8 @@ void SwCursorShell::Combine() SwCursorSaveState aSaveState(*m_pStackCursor); // stack cursor & current cursor in same Section? assert(!m_pStackCursor->HasMark() || - CheckNodesRange(m_pStackCursor->GetMark()->nNode, - m_pCurrentCursor->GetPoint()->nNode, true)); + CheckNodesRange(m_pStackCursor->GetMark()->GetNode(), + m_pCurrentCursor->GetPoint()->GetNode(), true)); *m_pStackCursor->GetPoint() = *m_pCurrentCursor->GetPoint(); m_pStackCursor->GetPtPos() = m_pCurrentCursor->GetPtPos(); diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index 75e631dea971..f588e12f3d63 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -316,8 +316,8 @@ static bool lcl_ChkOneRange( CHKSECTION eSec, bool bChkSections, * * @return <true> if valid range */ -bool CheckNodesRange( const SwNodeIndex& rStt, - const SwNodeIndex& rEnd, bool bChkSection ) +bool CheckNodesRange( const SwNode& rStt, + const SwNode& rEnd, bool bChkSection ) { const SwNodes& rNds = rStt.GetNodes(); SwNodeOffset nStt = rStt.GetIndex(), nEnd = rEnd.GetIndex(); @@ -369,7 +369,7 @@ SwContentNode* GoNextNds( SwNodeIndex* pIdx, bool bChk ) if( pNd ) { if( bChk && SwNodeOffset(1) != aIdx.GetIndex() - pIdx->GetIndex() && - !CheckNodesRange( *pIdx, aIdx, true ) ) + !CheckNodesRange( pIdx->GetNode(), aIdx.GetNode(), true ) ) pNd = nullptr; else *pIdx = aIdx; @@ -384,7 +384,7 @@ SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk ) if( pNd ) { if( bChk && SwNodeOffset(1) != pIdx->GetIndex() - aIdx.GetIndex() && - !CheckNodesRange( *pIdx, aIdx, true ) ) + !CheckNodesRange( pIdx->GetNode(), aIdx.GetNode(), true ) ) pNd = nullptr; else *pIdx = aIdx; diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 9a9361b3957b..30da6b644ea0 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -202,7 +202,7 @@ bool SwTableCursor::IsSelOvrCheck(SwCursorSelOverFlags eFlags) && HasMark() ) { SwNodeIndex aOldPos( rNds, GetSavePos()->nNode ); - if( !CheckNodesRange( aOldPos, GetPoint()->nNode, true )) + if( !CheckNodesRange( aOldPos.GetNode(), GetPoint()->GetNode(), true )) { GetPoint()->nNode = aOldPos; GetPoint()->nContent.Assign( GetContentNode(), GetSavePos()->nContent ); @@ -270,7 +270,7 @@ bool SwCursor::IsSelOvr( SwCursorSelOverFlags eFlags ) bool bIsValidPos = nullptr != pCNd; const bool bValidNodesRange = bIsValidPos && - ::CheckNodesRange( rPtIdx, aIdx, true ); + ::CheckNodesRange( rPtIdx.GetNode(), aIdx.GetNode(), true ); if( !bValidNodesRange ) { rPtIdx = m_vSavePos.back().nNode; @@ -427,7 +427,7 @@ bool SwCursor::IsSelOvr( SwCursorSelOverFlags eFlags ) return false; // check for invalid sections - if( !::CheckNodesRange( GetMark()->nNode, GetPoint()->nNode, true )) + if( !::CheckNodesRange( GetMark()->GetNode(), GetPoint()->GetNode(), true )) { DeleteMark(); RestoreSavePos(); @@ -533,8 +533,8 @@ bool SwCursor::IsSelOvr( SwCursorSelOverFlags eFlags ) // we permit these if( pMyNd->IsContentNode() && - ::CheckNodesRange( GetMark()->nNode, - GetPoint()->nNode, true )) + ::CheckNodesRange( GetMark()->GetNode(), + GetPoint()->GetNode(), true )) { // table in table const SwTableNode* pOuterTableNd = pMyNd->FindTableNode(); @@ -2059,7 +2059,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt, while( nCnt && (bUp ? pFrame->UnitUp( this, nUpDownX, bInReadOnly ) : pFrame->UnitDown( this, nUpDownX, bInReadOnly ) ) && - CheckNodesRange( aOldPos.nNode, GetPoint()->nNode, bChkRange )) + CheckNodesRange( aOldPos.GetNode(), GetPoint()->GetNode(), bChkRange )) { std::pair<Point, bool> const tmp(aPt, true); pFrame = GetContentNode()->getLayoutFrame(&rLayout, GetPoint(), &tmp); diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx index 616292668a77..64db5d5f068c 100644 --- a/sw/source/core/doc/docbm.cxx +++ b/sw/source/core/doc/docbm.cxx @@ -1867,7 +1867,7 @@ void SaveBookmark::SetInDoc( aPam.GetPoint()->nContent.Assign(aPam.GetContentNode(), m_nContent1); if(aPam.HasMark() - && !CheckNodesRange(aPam.GetPoint()->nNode, aPam.GetMark()->nNode, true)) + && !CheckNodesRange(aPam.GetPoint()->GetNode(), aPam.GetMark()->GetNode(), true)) return; ::sw::mark::IBookmark* const pBookmark = dynamic_cast<::sw::mark::IBookmark*>( diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 20b18ef82106..a285d0a0829f 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -137,13 +137,13 @@ static void lcl_CheckEmptyLayFrame( SwNodes const & rNds, SwSectionData& rSectio { SwNodeIndex aIdx( rStt ); if( !SwNodes::GoPrevSection( &aIdx, true, false ) || - !CheckNodesRange( rStt, aIdx, true ) || + !CheckNodesRange( rStt, aIdx.GetNode(), true ) || // #i21457# !lcl_IsInSameTableBox( rNds, rStt, true )) { aIdx = rEnd; if( !rNds.GoNextSection( &aIdx, true, false ) || - !CheckNodesRange( rEnd, aIdx, true ) || + !CheckNodesRange( rEnd, aIdx.GetNode(), true ) || // #i21457# !lcl_IsInSameTableBox( rNds, rEnd, false )) { @@ -1209,13 +1209,13 @@ void SwSectionNode::DelFrames(SwRootFrame const*const /*FIXME TODO*/, bool const SwNodeIndex aIdx( *this ); if( !SwNodes::GoPrevSection( &aIdx, true, false ) || - !CheckNodesRange( *this, aIdx, true ) || + !CheckNodesRange( *this, aIdx.GetNode(), true ) || // #i21457# !lcl_IsInSameTableBox( rNds, *this, true )) { aIdx = *EndOfSectionNode(); if( !rNds.GoNextSection( &aIdx, true, false ) || - !CheckNodesRange( *EndOfSectionNode(), aIdx, true ) || + !CheckNodesRange( *EndOfSectionNode(), aIdx.GetNode(), true ) || // #i21457# !lcl_IsInSameTableBox( rNds, *EndOfSectionNode(), false )) { diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index 5cc15c3106b5..cad4ee0c6e2c 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -148,7 +148,7 @@ SwFrame const* FindNeighbourFrameForNode(SwNode const& rNode) SwFlowFrame const* pFlow(nullptr); if (SwNode *const pNode = GoPreviousWithFrame(&idx, &pFlow)) { - if (::CheckNodesRange(rNode, idx, true)) + if (::CheckNodesRange(rNode, idx.GetNode(), true)) { while (pFlow->HasFollow()) { // try to get the one on the current page @@ -160,7 +160,7 @@ SwFrame const* FindNeighbourFrameForNode(SwNode const& rNode) idx = rNode; if (SwNode *const pNode = GoNextWithFrame(idx.GetNodes(), &idx, &pFlow)) { - if (::CheckNodesRange(rNode, idx, true)) + if (::CheckNodesRange(rNode, idx.GetNode(), true)) { while (pFlow->IsFollow()) { // try to get the one on the current page diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx index 114ceca86524..3e8baadd7800 100644 --- a/sw/source/core/docnode/nodes.cxx +++ b/sw/source/core/docnode/nodes.cxx @@ -913,7 +913,7 @@ void SwNodes::SectionDown(SwNodeRange *pRange, SwStartNodeType eSttNdTyp ) { if( pRange->aStart >= pRange->aEnd || pRange->aEnd >= Count() || - !::CheckNodesRange(pRange->aStart, pRange->aEnd, false)) + !::CheckNodesRange(pRange->aStart.GetNode(), pRange->aEnd.GetNode(), false)) { return; } @@ -967,7 +967,7 @@ void SwNodes::SectionUp(SwNodeRange *pRange) { if( pRange->aStart >= pRange->aEnd || pRange->aEnd >= Count() || - !::CheckNodesRange(pRange->aStart, pRange->aEnd, false) || + !::CheckNodesRange(pRange->aStart.GetNode(), pRange->aEnd.GetNode(), false) || ( HighestLevel( *this, *pRange ) <= 1 )) { return; @@ -1097,7 +1097,7 @@ void SwNodes::Delete(const SwNodeIndex &rIndex, SwNodeOffset nNodes) // check if [rIndex..rIndex + nCnt] is larger than the range if( ( !aRg.aStart.GetNode().StartOfSectionIndex() && !aRg.aStart.GetIndex() ) || - !::CheckNodesRange(aRg.aStart, aRg.aEnd, false)) + !::CheckNodesRange(aRg.aStart.GetNode(), aRg.aEnd.GetNode(), false)) { return; } @@ -2247,7 +2247,7 @@ SwNode* SwNodes::FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, { pFrameNd = GoPrevSection( &aIdx, true, false ); if ( nullptr != pFrameNd && !( - ::CheckNodesRange( aIdx, rFrameIdx, true ) && + ::CheckNodesRange( aIdx.GetNode(), rFrameIdx.GetNode(), true ) && // Never out of the table at the start pFrameNd->FindTableNode() == pTableNd && // Bug 37652: Never out of the table at the end @@ -2311,7 +2311,7 @@ SwNode* SwNodes::FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx, pFrameNd = GoNextSection( &aIdx, true, false ); // NEVER leave the section when doing this! if (pFrameNd - && !(::CheckNodesRange(aIdx, rFrameIdx, true) + && !(::CheckNodesRange(aIdx.GetNode(), rFrameIdx.GetNode(), true) && (pFrameNd->FindTableNode() == pTableNd && // NEVER go out of the table cell at the end (!pFrameNd->FindTableNode() || pFrameNd->FindTableBoxStartNode() diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index 29eacda35114..b00ad5b1fdff 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -143,14 +143,14 @@ bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode const e "invalid content index " << rPtPos.m_nContent << " but text node has only " << pCNd->Len()); rRegion.GetPoint()->nContent.Assign(pCNd, std::min<sal_Int32>(rPtPos.m_nContent, pCNd->Len())); - OSL_ENSURE( CheckNodesRange( rRegion.Start()->nNode, - rRegion.End()->nNode, true ), + OSL_ENSURE( CheckNodesRange( rRegion.Start()->GetNode(), + rRegion.End()->GetNode(), true ), "attribute or similar crosses section-boundaries" ); bool bRet = true; if (eCheck & RegionMode::CheckNodes) { - bRet &= CheckNodesRange(rRegion.Start()->nNode, - rRegion.End()->nNode, true); + bRet &= CheckNodesRange(rRegion.Start()->GetNode(), + rRegion.End()->GetNode(), true); } if (eCheck & RegionMode::CheckFieldmark) { diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index c6b4023f6c5e..c43d95c5da78 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -611,8 +611,8 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo) // in sw3io), so no action here } else if ( m_bIgnoreRedlines || - !CheckNodesRange( aPaM.GetPoint()->nNode, - aPaM.GetMark()->nNode, + !CheckNodesRange( aPaM.GetPoint()->GetNode(), + aPaM.GetMark()->GetNode(), true ) || (pRedlineInfo->pContentIndex && (pRedlineInfo->pContentIndex->GetIndex() + 2
