diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-04-18 15:46:26 +0300 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-04-27 16:14:15 +0200 |
commit | 49675d167489fd1dc227238d604a26274415e0d9 (patch) | |
tree | 9f9ca7ea42b7e10954768ba3c15bae158e14b240 | |
parent | backport writer sidebar "check SfxViewFrame::Current()" (diff) | |
download | core-49675d167489fd1dc227238d604a26274415e0d9.tar.gz core-49675d167489fd1dc227238d604a26274415e0d9.zip |
bApres -> bAfter
Change-Id: Iac6965fa7695e9123b7861add6e4425bb31b79ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150574
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150744
(cherry picked from commit 38473155a499cc6b7ebc32c92a947194b2ae5e67)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151111
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
-rw-r--r-- | sw/source/core/inc/sectfrm.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/layout/frmtool.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index 09c742f8da79..6c40c6589f31 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -109,7 +109,7 @@ public: * Splits the SectionFrame surrounding the pFrame up in two parts: * pFrame and the start of the 2nd part */ - bool SplitSect( SwFrame* pFrame, bool bApres ); + bool SplitSect( SwFrame* pFrame, bool bAfter ); void DelEmpty( bool bRemove ); // Like Cut(), except for that Follow chaining is maintained SwFootnoteContFrame* ContainsFootnoteCont( const SwFootnoteContFrame* pCont = nullptr ) const; bool Growable() const; diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index e47c68283e33..b4f676b85745 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -2027,7 +2027,7 @@ void MakeFrames( SwDoc *pDoc, SwNode &rSttIdx, SwNode &rEndIdx ) pDoc->getIDocumentLayoutAccess().GetCurrentLayout()); if ( pNd ) { - bool bApres = *pNd < rSttIdx; + bool bAfter = *pNd < rSttIdx; SwNode2Layout aNode2Layout( *pNd, rSttIdx.GetIndex() ); sw::FrameMode eMode = sw::FrameMode::Existing; ::std::vector<SwFrame*> frames; @@ -2075,7 +2075,7 @@ void MakeFrames( SwDoc *pDoc, SwNode &rSttIdx, SwNode &rEndIdx ) SwFlowFrame *pTmp = SwFlowFrame::CastFlowFrame( pMove ); assert(pTmp); - if ( bApres ) + if ( bAfter ) { // The rest of this page should be empty. Thus, the following one has to move to // the next page (it might also be located in the following column). @@ -2168,12 +2168,12 @@ void MakeFrames( SwDoc *pDoc, SwNode &rSttIdx, SwNode &rEndIdx ) else { bool bSplit; - SwFrame* pPrv = bApres ? pFrame : pFrame->GetPrev(); + SwFrame* pPrv = bAfter ? pFrame : pFrame->GetPrev(); // If the section frame is inserted into another one, it must be split. if( pSct && rSttIdx.IsSectionNode() ) { - bSplit = pSct->SplitSect( pFrame, bApres ); - if( !bSplit && !bApres ) + bSplit = pSct->SplitSect( pFrame, bAfter ); + if( !bSplit && !bAfter ) { pUpper = pSct->GetUpper(); pPrv = pSct->GetPrev(); diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index eb667dd51fc5..0a82b8cc0dfd 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -516,17 +516,17 @@ void SwSectionFrame::MergeNext( SwSectionFrame* pNxt ) |* This is required when inserting an inner section, because the MoveFwd |* cannot have the desired effect within a frame or a table cell. |*/ -bool SwSectionFrame::SplitSect( SwFrame* pFrame, bool bApres ) +bool SwSectionFrame::SplitSect( SwFrame* pFrame, bool bAfter ) { assert(pFrame && "SplitSect: Why?"); - SwFrame* pOther = bApres ? pFrame->FindNext() : pFrame->FindPrev(); + SwFrame* pOther = bAfter ? pFrame->FindNext() : pFrame->FindPrev(); if( !pOther ) return false; SwSectionFrame* pSect = pOther->FindSctFrame(); if( pSect != this ) return false; // Put the content aside - SwFrame* pSav = ::SaveContent( this, bApres ? pOther : pFrame ); + SwFrame* pSav = ::SaveContent( this, bAfter ? pOther : pFrame ); OSL_ENSURE( pSav, "SplitSect: What's on?" ); if( pSav ) // be robust { // Create a new SctFrame, not as a Follower/master |