diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-04-01 15:49:13 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-05-31 15:43:28 +0200 |
| commit | 51e0cdd80844daadf45710bf5181c8e07198a35b (patch) | |
| tree | 595fccca46633f1904b255ecfe92edf1d6bc6a26 | |
| parent | 8e188375cd9c8488e6d92ebbb6b4f5df48a736c8 (diff) | |
forcepoint#98 don't delete SwFrame flagged as IsDeleteForbidden
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132435
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 3644508aceee6019842bea1fee6c177eabd61681)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132484
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit ff6ca44405e0f472441bfa3902f6a3d614028029)
Change-Id: I1ac2db4bf96afc4bdc8e0646576f5fa0bcd9e410
| -rw-r--r-- | sw/qa/extras/layout/data/forcepoint98.html | bin | 0 -> 7171 bytes | |||
| -rw-r--r-- | sw/qa/extras/layout/layout.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/layout/sectfrm.cxx | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/sw/qa/extras/layout/data/forcepoint98.html b/sw/qa/extras/layout/data/forcepoint98.html Binary files differnew file mode 100644 index 000000000000..9d4b76c53e76 --- /dev/null +++ b/sw/qa/extras/layout/data/forcepoint98.html diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 993a1bdd4f3e..859df7a7d4e7 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2990,6 +2990,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) { createDoc("tdf147485-forcepoint.doc"); 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(); |