DOCX export: handle exact end of paragraph w:sdt tags

Desktop / LibreOffice - Miklos Vajna [collabora.co.uk] - 31 July 2014 02:55 UTC

Previously every paragraph SDT was closed immediately after the paragraph end. This commit adds support for having multiple paragraphs inside an SDT.

A few testcases implicitly tested that such SDT's are lost on save, adjust the relevant XPath expressions now that this works.

4a39475 DOCX export: handle exact end of paragraph w:sdt tags
sw/qa/extras/ooxmlexport/data/sdt-2-para.docx | Bin 0 -> 15487 bytes
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 28 +++++++++----
sw/source/filter/ww8/docxattributeoutput.cxx | 55 ++++++++++++++++++++++++-
sw/source/filter/ww8/docxattributeoutput.hxx | 8 ++++
sw/source/filter/ww8/docxexport.cxx | 7 ++++
sw/source/filter/ww8/docxexport.hxx | 3 ++
sw/source/filter/ww8/docxsdrexport.cxx | 23 +++++++++++
sw/source/filter/ww8/docxsdrexport.hxx | 5 +++
8 files changed, 119 insertions(+), 10 deletions(-)

Upstream: cgit.freedesktop.org


  • Share