commit 780842b6fba24b753f33015bd5c2ad46ced4771c
author Caolán McNamara <caolanm@redhat.com> Thu Feb 17 09:57:34 2022 +0000
committer Michael Stahl <michael.stahl@allotropia.de> Thu Feb 17 19:07:57 2022 +0100
tree 03f47667696bb85108466d90f2ca4d7809ada68f
parent f7e03352c18e13161effcfe08c7591d3be11b3e0

Refetch in case SwTextNode::InsertItem causes it to be deleted

Change-Id: Ie189ae4d37ffc33e58bb405f2521d1ae02a9997b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130025
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx

diff --git a/sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx b/sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx
new file mode 100755
index 0000000..add554a
--- /dev/null
+++ b/sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx
Binary files differ

sw/source/core/unocore/unodraw.cxx

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 4d04857..e61a668 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1141,6 +1141,8 @@ void SwXShape::setPropertyValue(const OUString& rPropertyName, const uno::Any& a
                    SwFormatFlyCnt aFormat( pFormat );
                    pNd->InsertItem(aFormat, pInternalPam->GetPoint()
                            ->nContent.GetIndex(), 0 );
                    //Refetch in case SwTextNode::InsertItem causes it to be deleted
                    pFormat = GetFrameFormat();
                }
                else
                {