sw/qa/extras/layout/data/forcepoint89.html |binary sw/qa/extras/layout/layout.cxx | 6 ++++++ sw/source/core/layout/layact.cxx | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)
New commits: commit 448fa0bc518e0813b26e5d6c6178444b126bbbb4 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Fri Mar 25 12:10:32 2022 +0000 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Fri Mar 25 22:02:59 2022 +0100 forcepoint#89 don't remove page with footnote continuation frame in browse/html/web mode Change-Id: Ic821dd7f2cc1f47305b5fe2ced16d5168aedc0b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132122 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/qa/extras/layout/data/forcepoint89.html b/sw/qa/extras/layout/data/forcepoint89.html new file mode 100644 index 000000000000..7998a2b0b979 Binary files /dev/null and b/sw/qa/extras/layout/data/forcepoint89.html differ diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index d44cceac3eff..38ce7fa2a37b 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2497,6 +2497,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testN4LA0OHZ) createSwDoc(DATA_DIRECTORY, "LIBREOFFICE-N4LA0OHZ.rtf"); } +//just care it doesn't crash/assert +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint89) +{ + createSwWebDoc(DATA_DIRECTORY, "forcepoint89.html"); +} + CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118058) { SwDoc* pDoc = createSwDoc(DATA_DIRECTORY, "tdf118058.fodt"); diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index c7a00139478a..558cbdff22f8 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -296,7 +296,8 @@ bool SwLayAction::RemoveEmptyBrowserPages() do { if ( (pPage->GetSortedObjs() && pPage->GetSortedObjs()->size()) || - pPage->ContainsContent() ) + pPage->ContainsContent() || + pPage->FindFootnoteCont() ) pPage = static_cast<SwPageFrame*>(pPage->GetNext()); else {