diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-02-17 09:57:34 +0000 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-02-17 21:50:36 +0100 |
| commit | 22a8d7c22a023b34ec51cab4772b896dadb4d5ae (patch) | |
| tree | 9c6d8096fcd239e9610c15ef600d96291b8d4983 /sw | |
| parent | 5da6e5722fffb8f303a5c4f03c9cecb68c5a7f4c (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 876cad2231df..4f8c59dd3fb6 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1177,6 +1177,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 { |