RTF import: handle d{x,y}WrapDist* picture properties

Desktop / LibreOffice - Miklos Vajna [collabora.co.uk] - 21 April 2015 06:02 UTC

Commit e789c7f0f15a6b571de95b81e77e3a323e9f540e (RTF import of d{x,y}WrapDist* shape properties, 2013-04-09) added support for wrap distance of shapes, but that was ignored for shapes, as dmapper later overwrote the set margins.

Fix this by generating the expected tokens in case of pictures, then dmapper will take care of the rest.

Also add testcases for the original shape wrap distance feature that was missing.

7546a90 RTF import: handle d{x,y}WrapDist* picture properties
sw/qa/extras/rtfimport/data/wrap-distance.rtf | 69 ++++++++++++++++++++++++
sw/qa/extras/rtfimport/rtfimport.cxx | 18 +++++++
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 5 +-
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 2 +
writerfilter/source/rtftok/rtfsdrimport.cxx | 19 +++++--
writerfilter/source/rtftok/rtfsdrimport.hxx | 2 +
6 files changed, 108 insertions(+), 7 deletions(-)

Upstream: cgit.freedesktop.org

  • Share