[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-7-0' - sw/qa sw/source

[Attila Bakos (NISZ) (via logerrit)]

 sw/qa/extras/uiwriter/data3/txbx_crash.odt |binary
 sw/qa/extras/uiwriter/uiwriter3.cxx        |   31 +++++++++++++++++++++++++++++
 sw/source/core/doc/textboxhelper.cxx       |    7 +++++-
 3 files changed, 37 insertions(+), 1 deletion(-)

New commits:
commit f9a26bd2f5fae14ed99d8240a090b9a5aae1fcc2
Author:     Attila Bakos (NISZ) <bakos.attilakaroly at nisz.hu>
AuthorDate: Thu Oct 15 16:45:15 2020 +0200
Commit:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
CommitDate: Wed Apr 21 14:11:37 2021 +0200

    tdf#137802 sw: fix crash on deleting last paragraph
    
    if the last paragraph of document had a text box
    anchored to.
    
    Change-Id: Ibe29a0f37d06223c31f3add0c194e4414f65d5ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104379
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 056933bc55608d0ca061539ae124d7b9386cdb62)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114354
    Tested-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
    Reviewed-by: Gabor Kelemen <kelemen.gabor2 at nisz.hu>

diff --git a/sw/qa/extras/uiwriter/data3/txbx_crash.odt b/sw/qa/extras/uiwriter/data3/txbx_crash.odt
new file mode 100755
index 000000000000..0a029da88289
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/txbx_crash.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 245c57ebb788..60e2d5067166 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -772,6 +772,37 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf107893)
     CPPUNIT_ASSERT_MESSAGE("Textbox cannot be readd after Undo!", pTxBxFrm);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, TestTextBoxCrashAfterLineDel)
+{
+    // Open the desired file
+    load(DATA_DIRECTORY, "txbx_crash.odt");
+    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxComponent.get());
+    CPPUNIT_ASSERT(pTextDoc);
+
+    // Get the Writer shell
+    SwWrtShell* pWrtSh = pTextDoc->GetDocShell()->GetWrtShell();
+    CPPUNIT_ASSERT(pWrtSh);
+
+    // Get the format of the shape
+    const SwFrameFormats& rFrmFormats = *pWrtSh->GetDoc()->GetSpzFrameFormats();
+    CPPUNIT_ASSERT(rFrmFormats.size() >= size_t(o3tl::make_unsigned(1)));
+    SwFrameFormat* pShape = rFrmFormats.front();
+    CPPUNIT_ASSERT(pShape);
+
+    // Add a textbox
+    SwTextBoxHelper::create(pShape);
+    SwFrameFormat* pTxBxFrm = SwTextBoxHelper::getOtherTextBoxFormat(getShape(1));
+    CPPUNIT_ASSERT(pTxBxFrm);
+
+    // remove the last paragraph
+    auto xCursor = getParagraph(1)->getText()->createTextCursor();
+    xCursor->gotoEnd(false);
+    xCursor->goLeft(3, true);
+
+    // This caused crash before, now it should pass with the patch.
+    xCursor->setString(OUString());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf96067)
 {
     mxComponent = loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument");
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 98debf9b59d4..43e77acd9fea 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -89,7 +89,12 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape, bool bCopyText)
     }
     catch (uno::Exception&)
     {
-        xTextContentAppend->appendTextContent(xTextFrame, uno::Sequence<beans::PropertyValue>());
+        // Before the textframe was appended now it is inserted to the begin of the doc in order
+        // to prevent crash when someone removes the para where the textframe anchored:
+        uno::Reference<text::XTextCursor> xCursor = xTextDocument->getText()->createTextCursor();
+        xCursor->gotoStart(false);
+        xTextContentAppend->insertTextContentWithProperties(
+            xTextFrame, uno::Sequence<beans::PropertyValue>(), xCursor->getStart());
     }
     // Link FLY and DRAW formats, so it becomes a text box (needed for syncProperty calls).
     uno::Reference<text::XTextFrame> xRealTextFrame(xTextFrame, uno::UNO_QUERY);