diff options
author | Caolán McNamara <caolanm@redhat.com> | 2022-02-17 09:57:34 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2022-02-17 16:25:10 +0100 |
commit | 0de9a87e36f928a360245feb86e30e48d94c5e8b (patch) | |
tree | ae57b2883c56add2635ca1e066f5cdd1c346b3db /sw | |
parent | 60f786bde4524bbba462eccc6578715f39020076 (diff) |
Refetch in case SwTextNode::InsertItem causes it to be deleted
Change-Id: Ie189ae4d37ffc33e58bb405f2521d1ae02a9997b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130072
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
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 4253e5e90b60..dedc10bce213 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -1149,6 +1149,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 { |