diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-02-17 09:57:34 +0000 |
|---|---|---|
| committer | Gabor Kelemen <kelemeng@ubuntu.com> | 2022-05-24 13:29:24 +0200 |
| commit | 04bdcd02df37eed341ba5634c150531b3ead1d0f (patch) | |
| tree | 01884cf11d0dc61dd6188cd3a686bc4979108e6c /sw | |
| parent | dc915008a445369d5841f8f1c14fea7a251aed4a (diff) | |
Refetch in case SwTextNode::InsertItem causes it to be deleted
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130087
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 3dab7bc9dd8763d68fc2e6496e8069c7823685c2)
Change-Id: Ie189ae4d37ffc33e58bb405f2521d1ae02a9997b
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 e2d61dc8abe1..19cc99e4f4ac 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1173,6 +1173,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 { |