diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-11-18 17:17:29 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-11-19 11:16:52 +0100 |
| commit | da967d5f8f450fbcbe1f595dbfc357eb7c8b3c50 (patch) | |
| tree | 405f090caf448fe52028d649d686f0a1fa33be97 /sw/CppunitTest_sw_rtfexport4.mk | |
| parent | c6babe8987711c83e6d0b99312fd9a2c3d55322b (diff) | |
sw: RTF export: fix invalid RTF for shapes and text frames again
It turns out that commit 4652b911c4376048a452709c953197e1a879a921 wasn't
quite right: writing out the m_aRunText doesn't necessarily put it in
the right place, it just happened to work on that bugdoc but in other
cases the shape may be written before the paragraph properties of the
paragraph it's in...
So instead change the text frame case to save and restore the run
related buffers and members, so that the text frame itself can do
whatever it wants, and the result is appended to m_aRunText.
The members saved are a superset of those saved in
WriteHeaderFooter_Impl(), writeTextFrame(), TextFootnote_Impl().
Also another thing was missing is that OLE objects would trigger the
assert because they are also buffered into m_aRunText, e.g.
ooo46760-1.odt.
Change-Id: Icc6988f8ed19724c593760df46e0254792cd1735
Reviewed-on: https://gerrit.libreoffice.org/83105
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw/CppunitTest_sw_rtfexport4.mk')
| -rw-r--r-- | sw/CppunitTest_sw_rtfexport4.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/CppunitTest_sw_rtfexport4.mk b/sw/CppunitTest_sw_rtfexport4.mk index bf91d154d029..4d35bcb718a2 100644 --- a/sw/CppunitTest_sw_rtfexport4.mk +++ b/sw/CppunitTest_sw_rtfexport4.mk @@ -22,6 +22,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_rtfexport4, \ cppu \ cppuhelper \ sal \ + svl \ sfx \ sw \ test \ |