summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docxbin0 -> 15567 bytes
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx3
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
new file mode 100644
index 000000000000..da51cc798cb1
--- /dev/null
+++ b/sw/qa/core/exportdata/ooxml/pass/sdt-before-table.docx
Binary files 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);