diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-02-17 09:57:34 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2022-02-18 12:35:45 +0100 |
commit | ba62151132f6d21e172f71209e901a9dd737283c (patch) | |
tree | 0f8695f82a797ec1e7621d1548ff8c36f95f9558 /sw | |
parent | 6cb52953d317123a36c4d9e9c2d6b3b5624eff73 (diff) |
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>
Diffstat (limited to 'sw')
-rwxr-xr-x | sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx | bin | 0 -> 89419 bytes | |||
-rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx b/sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx Binary files differnew file mode 100755 index 000000000000..add554ae9596 --- /dev/null +++ b/sw/qa/core/data/ooxml/fail/LIBREOFFICE-DBDAZAEC.docx 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 { |