From b500167f01bdcc0097efcffb2ccd3a010e05df14 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 1 Apr 2022 15:49:13 +0100 Subject: forcepoint#98 don't delete SwFrame flagged as IsDeleteForbidden MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132435 Tested-by: Jenkins Reviewed-by: Caolán McNamara (cherry picked from commit 3644508aceee6019842bea1fee6c177eabd61681) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132484 Reviewed-by: Michael Stahl (cherry picked from commit ff6ca44405e0f472441bfa3902f6a3d614028029) Change-Id: I1ac2db4bf96afc4bdc8e0646576f5fa0bcd9e410 --- sw/qa/extras/layout/data/forcepoint98.html | Bin 0 -> 7171 bytes sw/qa/extras/layout/layout.cxx | 8 ++++++++ sw/source/core/layout/sectfrm.cxx | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/layout/data/forcepoint98.html diff --git a/sw/qa/extras/layout/data/forcepoint98.html b/sw/qa/extras/layout/data/forcepoint98.html new file mode 100644 index 000000000000..9d4b76c53e76 Binary files /dev/null and b/sw/qa/extras/layout/data/forcepoint98.html differ diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index ef7962aa09fe..8c80f37c1680 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -3006,6 +3006,14 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint94) } #endif +//just care it doesn't crash/assert +#if 0 // no createSwWebDoc +CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint98) +{ + createSwWebDoc(DATA_DIRECTORY, "forcepoint98.html"); +} +#endif + //just care it doesn't crash/assert CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf147485Forcepoint) { diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index 524562585bd1..48debbcc399a 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -2863,7 +2863,8 @@ void SwRootFrame::DeleteEmptySct_() mpDestroy->erase( mpDestroy->begin() ); OSL_ENSURE( !pSect->IsColLocked() && !pSect->IsJoinLocked(), "DeleteEmptySct: Locked SectionFrame" ); - if( !pSect->getFrameArea().HasArea() && !pSect->ContainsContent() ) + SAL_WARN_IF(pSect->IsDeleteForbidden(), "sw.layout", "not allowed delete SwFrame"); + if( !pSect->getFrameArea().HasArea() && !pSect->ContainsContent() && !pSect->IsDeleteForbidden() ) { SwLayoutFrame* pUp = pSect->GetUpper(); pSect->RemoveFromLayout(); -- cgit