sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx |binary
sw/source/filter/ww8/docxattributeoutput.cxx | 3 +++
2 files changed, 3 insertions(+)
New commits:
commit 914431e165ab4c9d99be329a8b8c68fdaccff960
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Aug 19 10:22:48 2014 +0200
DOCX export: handle multi-para SDT's ending right before a table
Change-Id: I47ea5fd6e1b4d9d5a2893112efdcd810c4c84cfb
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 0000000..da51cc7
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 86065cb..d2c4f71 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);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
