[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa sw/source

[Caolán McNamara (via logerrit)]

 sw/qa/extras/layout/data/forcepoint98.html |binary
 sw/qa/extras/layout/layout.cxx             |    8 ++++++++
 sw/source/core/layout/sectfrm.cxx          |    3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit af7f463f9bdacb69b3cf97ccd0354ba675e74094
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Apr 1 15:49:13 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Mon May 16 12:44:37 2022 +0200

    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 <caol...@redhat.com>
    (cherry picked from commit 3644508aceee6019842bea1fee6c177eabd61681)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132484
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit ff6ca44405e0f472441bfa3902f6a3d614028029)
    
    Change-Id: I1ac2db4bf96afc4bdc8e0646576f5fa0bcd9e410
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133953
    Tested-by: Michael Stahl <michael.st...@allotropia.de>
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

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 ce9c3387f28b..356420f24570 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3098,6 +3098,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();