[Libreoffice-commits] core.git: Branch 'libreoffice-7-3-1' - sw/qa sw/source

[Caolán McNamara (via logerrit)]

 sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx |binary
 sw/source/core/unocore/unodraw.cxx                   |    2 ++
 2 files changed, 2 insertions(+)

New commits:
commit cd1393acfc0065a8e8cbe85bb7b29dab64bc8d89
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Feb 17 09:57:34 2022 +0000
Commit:     Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Feb 23 13:27:38 2022 +0100

    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.st...@allotropia.de>
    (cherry picked from commit 780842b6fba24b753f33015bd5c2ad46ced4771c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130147
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>

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 000000000000..add554ae9596
Binary files /dev/null and 
b/sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx differ
diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index 4d04857e7199..e61a66850001 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
                 {