sw/qa/core/layout/data/tables-move-backwards.odt |binary sw/qa/core/layout/layout.cxx | 26 +++++++++++++++++++++++ sw/source/core/layout/layact.cxx | 12 +++++++++- 3 files changed, 37 insertions(+), 1 deletion(-)
New commits: commit e4da634b983052f300cd0e9b2bbaa60eb02c1b28 Author: Miklos Vajna <[email protected]> AuthorDate: Mon Mar 30 17:53:51 2020 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Mar 30 18:47:53 2020 +0200 sw: fix moving more than 20 table frames to a previous page Steps to reproduce the problem: - have some content on page1 - have more than 20 tables on page 2 - delete all content on page 1 The first 20 tables are moved to page 1 then the layout process stops as the layout loop control aborts it: warn:legacy.osl:8282:8282:sw/source/core/layout/layact.cxx:544: LoopControl_1 in SwLayAction::InternalAction and the remaining tables stay on page 2, even if page 1 would have space for them. There are various other ways to trigger the same problem, e.g. have a ToC, add lots of headings, update the ToC, undo. Fix the problem by doing more work in SwLayAction::FormatLayout in a single iteration: if a table frame is moved to a different parent we can still format the table's next frame in the same iteration with a bit of effort. Change-Id: I25912a69c19e042f0e0375898f4e0a5fa13321fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91377 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/sw/qa/core/layout/data/tables-move-backwards.odt b/sw/qa/core/layout/data/tables-move-backwards.odt new file mode 100644 index 000000000000..861dc4f4ad86 Binary files /dev/null and b/sw/qa/core/layout/data/tables-move-backwards.odt differ diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx index 7f8d885301d7..73e6114ff924 100644 --- a/sw/qa/core/layout/layout.cxx +++ b/sw/qa/core/layout/layout.cxx @@ -11,6 +11,8 @@ #include <vcl/gdimtf.hxx> +#include <wrtsh.hxx> + static char const DATA_DIRECTORY[] = "/sw/qa/core/layout/data/"; /// Covers sw/source/core/layout/ fixes. @@ -92,6 +94,30 @@ CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTableFlyOverlapSpacing) CPPUNIT_ASSERT_LESS(nFlyBottom, nTableTop); } +CPPUNIT_TEST_FIXTURE(SwCoreLayoutTest, testTablesMoveBackwards) +{ + // Load a document with 1 pages: empty content on first page, then 21 tables on the second page. + load(DATA_DIRECTORY, "tables-move-backwards.odt"); + SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get()); + SwDocShell* pDocShell = pTextDoc->GetDocShell(); + SwWrtShell* pWrtShell = pDocShell->GetWrtShell(); + + // Delete the content on the first page. + pWrtShell->SttEndDoc(/*bStart=*/true); + pWrtShell->EndPg(/*bSelect=*/true); + pWrtShell->DelLeft(); + + // Calc the layout and check the number of pages. + pWrtShell->CalcLayout(); + xmlDocPtr pLayout = parseLayoutDump(); + // Without the accompanying fix in place, this test would have failed with: + // - Expected: 1 + // - Actual : 2 + // i.e. there was an unexpected 2nd page, as only 20 out of 21 tables were moved to the first + // page. + assertXPath(pLayout, "//page", 1); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index 2f15852b8ac3..c4c5dc92c225 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -1354,6 +1354,7 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLa bool bTabChanged = false; while ( pLow && pLow->GetUpper() == pLay ) { + SwFrame* pNext = nullptr; if ( pLow->IsLayoutFrame() ) { if ( pLow->IsTabFrame() ) @@ -1364,6 +1365,11 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLa } ++m_nTabLevel; + + // Remember what was the next of the lower. Formatting may move it to the previous + // page, in which case it looses its next. + pNext = pLow->GetNext(); + bTabChanged |= FormatLayoutTab( static_cast<SwTabFrame*>(pLow), bAddRect ); --m_nTabLevel; } @@ -1378,7 +1384,11 @@ bool SwLayAction::FormatLayout( OutputDevice *pRenderContext, SwLayoutFrame *pLa if ( IsAgain() ) return false; - pLow = pLow->GetNext(); + if (!pNext) + { + pNext = pLow->GetNext(); + } + pLow = pNext; } // add complete frame area as paint area, if frame // area has been already added and after formatting its lowers the frame area _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
