diff options
-rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/layout/ftnfrm.cxx | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index b4c8aeb27931..e33cb736ce19 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1826,7 +1826,9 @@ bool SwFlowFrame::ForbiddenForFootnoteCntFwd() const return m_rThis.IsTabFrame() || m_rThis.IsInTab(); } -/// Return value tells us whether the Frame has changed the page. +/// Return value guarantees that a new page was not created, +/// although false does not NECESSARILY indicate that a new page was created. +/// Either false or true(MoveFootnoteCntFwd) can be returned if no changes were made bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) { //!!!!MoveFootnoteCntFwd might need to be updated as well. @@ -2025,10 +2027,11 @@ bool SwFlowFrame::MoveFwd( bool bMakePage, bool bPageBreak, bool bMoveAlways ) return bSamePage; } -/** Return value tells whether the Frame should change the page. +/** Return value tells whether any changes have been made. + * If true, the frame has moved backwards to an earlier column/section/frame/page etc. * * @note This should be called by derived classes. - * @note The actual moving must be implemented in the subclasses. + * @note The actual moving must be implemented in the subclasses via Cut()/Paste(). */ bool SwFlowFrame::MoveBwd( bool &rbReformat ) { diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 274c3ef159d5..1b143e7d7b87 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -2722,6 +2722,7 @@ bool SwLayoutFrame::MoveLowerFootnotes( SwContentFrame *pStart, SwFootnoteBossFr return bMoved; } +/// Return value guarantees that a new page was not created. See SwFlowFrame::MoveFwd. bool SwContentFrame::MoveFootnoteCntFwd( bool bMakePage, SwFootnoteBossFrame *pOldBoss ) { OSL_ENSURE( IsInFootnote(), "no footnote." ); |