[Libreoffice-commits] core.git: sw/qa sw/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 3644508aceee6019842bea1fee6c177eabd61681
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Apr 1 15:49:13 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Apr 3 13:11:56 2022 +0200

    forcepoint#98 don't delete SwFrame flagged as IsDeleteForbidden
    
    Change-Id: I1ac2db4bf96afc4bdc8e0646576f5fa0bcd9e410
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132435
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

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 02185383cc32..33be08fd0d3c 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2549,6 +2549,12 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf118058)
     pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
 }
 
+//just care it doesn't crash/assert
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testForcepoint98)
+{
+    createSwWebDoc(DATA_DIRECTORY, "forcepoint98.html");
+}
+
 CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128611)
 {
     createSwDoc(DATA_DIRECTORY, "tdf128611.fodt");
diff --git a/sw/source/core/layout/sectfrm.cxx 
b/sw/source/core/layout/sectfrm.cxx
index ce0c7a813f51..eb667dd51fc5 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2891,7 +2891,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();