diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/inc/rowfrm.hxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx index 2a393e078675..3786d00f8347 100644 --- a/sw/source/core/inc/rowfrm.hxx +++ b/sw/source/core/inc/rowfrm.hxx @@ -33,7 +33,7 @@ class SwRowFrame: public SwLayoutFrame virtual SwTwips GrowFrame ( SwTwips, bool bTst = false, bool bInfo = false ) override; const SwTableLine * m_pTabLine; - SwRowFrame * m_pFollowRow; + SwRowFrame * m_pFollowRow; ///< note: this is *only* set on old-style tables! // #i29550# sal_uInt16 mnTopMarginForLowers; sal_uInt16 mnBottomMarginForLowers; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index e1f7441eb8e3..5eea09dd55f7 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -882,11 +882,6 @@ bool SwTabFrame::RemoveFollowFlowLine() pFollowFlowLine && pLastLine, "There should be a flowline in the follow" ); - // We have to reset the flag here, because lcl_MoveRowContent - // calls a GrowFrame(), which has a different behavior if - // this flag is set. - SetFollowFlowLine( false ); - // #140081# Make code robust. if ( !pFollowFlowLine || !pLastLine ) return true; @@ -896,6 +891,11 @@ bool SwTabFrame::RemoveFollowFlowLine() return false; } + // We have to reset the flag here, because lcl_MoveRowContent + // calls a GrowFrame(), which has a different behavior if + // this flag is set. + SetFollowFlowLine( false ); + // Move content lcl_MoveRowContent( *pFollowFlowLine, *static_cast<SwRowFrame*>(pLastLine) ); |