diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-19 10:22:48 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-08-19 10:34:52 +0200 |
| commit | 914431e165ab4c9d99be329a8b8c68fdaccff960 (patch) | |
| tree | 4d19fdbf83ed00e23541ce26c93faba34e0967a9 | |
| parent | 7b31e45ec7106d2cfbdbb7915d97667ba710f81c (diff) | |
DOCX export: handle multi-para SDT's ending right before a table
Change-Id: I47ea5fd6e1b4d9d5a2893112efdcd810c4c84cfb
| -rw-r--r-- | sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx | bin | 0 -> 15567 bytes | |||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 3 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx b/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx Binary files differnew file mode 100644 index 000000000000..da51cc798cb1 --- /dev/null +++ b/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx 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); |