From 914431e165ab4c9d99be329a8b8c68fdaccff960 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 19 Aug 2014 10:22:48 +0200 Subject: DOCX export: handle multi-para SDT's ending right before a table Change-Id: I47ea5fd6e1b4d9d5a2893112efdcd810c4c84cfb --- sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx | Bin 0 -> 15567 bytes sw/source/filter/ww8/docxattributeoutput.cxx | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx diff --git a/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx b/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx new file mode 100644 index 000000000000..da51cc798cb1 Binary files /dev/null and b/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx differ diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 86065cbda2e7..d2c4f71735f9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -2953,6 +2953,9 @@ void DocxAttributeOutput::switchHeaderFooter(bool isHeaderFooter, sal_Int32 inde void DocxAttributeOutput::StartTable( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { + // In case any paragraph SDT's are open, close them here. + EndParaSdtBlock(); + m_pSerializer->startElementNS( XML_w, XML_tbl, FSEND ); tableFirstCells.push_back(pTableTextNodeInfoInner); -- cgit v1.2.3