sw/source/core/inc/rowfrm.hxx | 2 +-
sw/source/core/layout/tabfrm.cxx | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 98e186a37388d35320b813142b4fc7f0071f5b43
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Jun 21 12:44:18 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Jun 21 18:00:26 2019 +0200
sw: fix SwUiWriterTest::testTdf114306_2
sw/qa/extras/uiwriter/uiwriter.cxx:5908:SwUiWriterTest::testTdf114306_2
equality assertion failed
- Expected: 4
- Actual : 5
Mysteriously this doesn't happen on master when running make sw.check
but reproduces with
make CppunitTest_sw_uiwriter CPPUNIT_TEST_NAME="testTdf114306_2"
The problem is that the early-returns in SwTabFrame::RemoveFollowFlowLine()
are too late: the SetFollowFlowLine( false ); was already executed and
henceforth the SwTabFrame thinks it doesn't have a follow-flow-line, so
it will never be merged again and new follow-flow-line may be created.
(test fail is regression from 1e6dec4b4313212a3bdc6bb06155fd65e795368b)
Change-Id: Ic5a2ef4219f212c8b4d34fd47d3d67f32de45f8e
Reviewed-on: https://gerrit.libreoffice.org/74500
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
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)
);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
