sw/source/filter/ww8/docxattributeoutput.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit e930d96d95edc1c1e5fd54493d289a76f31a846f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Dec 18 14:31:43 2013 +0100
DocxAttributeOutput::EndParagraph: fix export of tables in textframes
This is triggered by
sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx when DML export
of
TextFrames is enabled in non-experimental mode.
Change-Id: I2a342cd4eaec0d718b7d1f4781defd591583731c
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4c7e6cc..81f6479 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -503,6 +503,12 @@ void DocxAttributeOutput::EndParagraph(
ww8::WW8TableNodeInfoInner::Pointer_t pT
FSEND);
WriteDMLTextFrame(pParentFrame);
m_pSerializer->endElementNS(XML_mc, XML_Choice);
+
+ // Reset table infos, otherwise the depth of the cells will be
incorrect,
+ // in case the text frame had table(s) and we try to export the
+ // same table second time.
+ m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new
ww8::WW8TableInfo());
+
m_pSerializer->startElementNS(XML_mc, XML_Fallback, FSEND);
WriteVMLTextFrame(pParentFrame);
m_pSerializer->endElementNS(XML_mc, XML_Fallback);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
