sw/qa/extras/layout/data/tdf123163-1.docx |binary sw/qa/extras/layout/layout.cxx | 6 ++++++ sw/source/core/layout/fly.cxx | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit 3a4ab31896b4c6a102a6726d32820885aa6b20d9 Author: Caolán McNamara <[email protected]> AuthorDate: Fri Sep 10 19:51:41 2021 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Tue Jun 21 11:31:56 2022 +0200 sw: fix assert in SwObjectFormatterTextFrame sw/source/core/layout/objectformattertxtfrm.cxx:237: virtual bool SwObjectFormatterTextFrame::DoFormatObj(SwAnchoredObject&, bool): Assertion `GetPageFrame().GetPhyPageNum() == GetPgNumOfCollected(nIdx)' failed. The problem is that there are multiple (9) flys on text frame 324. In the loop in CalcContent(), frame 324 starts out on page 13, then with the first/second fly moves to page 12, then with the 3rd fly moves forward to page 13 - but the pPageFrame that is passed to SwObjectFormatter::FormatObj() was fetched outside of the loop. (regression from commit c799de145f7e289f31e3669646e5bd12814e6c5e and commit 533a998e540b0f04068c876dde0e74adc3f79c93) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121924 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 7d20dc2ca69711c61fb1593ad85ccdef282c978d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134447 Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 611f1e5e6637610295d449c286d3d6981dd735aa) Change-Id: Iae573900b4b6558634bfed161e5c95bd5ba27151 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136174 Tested-by: Michael Stahl <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/sw/qa/extras/layout/data/tdf123163-1.docx b/sw/qa/extras/layout/data/tdf123163-1.docx new file mode 100644 index 000000000000..3f8865cb49b1 Binary files /dev/null and b/sw/qa/extras/layout/data/tdf123163-1.docx differ diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 1c91fda59bcd..a471bee7d838 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -3528,6 +3528,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf116501) createDoc("tdf116501.odt"); } +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf123163) +{ + //just care it doesn't assert + createDoc("tdf123163-1.docx"); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118719) { // Insert a page break. diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index a47d95e1ae6d..89f47ccf7632 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -1529,11 +1529,13 @@ void CalcContent( SwLayoutFrame *pLay, bool bNoColl ) { bool bAgain = false; bool bRestartLayoutProcess = false; - SwPageFrame* pPageFrame = pFrame->FindPageFrame(); size_t nCnt = pFrame->GetDrawObjs()->size(); size_t i = 0; while ( i < nCnt ) { + // pFrame can move to a different page in FormatObj() + SwPageFrame *const pPageFrame = pFrame->FindPageFrame(); + // #i28701# SwAnchoredObject* pAnchoredObj = (*pFrame->GetDrawObjs())[i]; assert(pAnchoredObj);
