summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ooxmlexport
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-06-09 17:26:14 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-06-10 11:14:34 +0100
commit6f9b3532ee81850500d9e87ad329c00ea9c83bba (patch)
tree8c8f81c3dd2750bd04dc07c3bec044037cca8adf /sw/qa/extras/ooxmlexport
parentbb42b693c81814a966723b5067a2d20754fe82e0 (diff)
fix crash on export of ooo67471-2.sxw to docx
This old-school table has three rows in it, but the second row is of 0 height so is indistinguisable from the third row by layout positioning, so the WW8TableNodeInfo view of the table is that it has two rows, and the comparison of being on the last row is done with the m_xTableWrt->GetRows view which considers it to have 3, so the table end marks are never output. add a new finalEndOfLine property that the WW8TableNodeInfo sets on the last end of row of the table as it sees it, which should resolve this. old style tables are a cess pit, which is why they were replaced Change-Id: I996aa59a338a594487f49ec0f228af3fb3032d15
Diffstat (limited to 'sw/qa/extras/ooxmlexport')
-rw-r--r--sw/qa/extras/ooxmlexport/data/ooo67471-2.odtbin0 -> 9511 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport5.cxx6
2 files changed, 6 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/ooo67471-2.odt b/sw/qa/extras/ooxmlexport/data/ooo67471-2.odt
new file mode 100644
index 000000000000..82daa57763a7
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/ooo67471-2.odt
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 5fe36fde8aa1..b63d7559f3a9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -825,6 +825,12 @@ DECLARE_OOXMLEXPORT_TEST(testOO47778_2, "ooo47778-4.odt")
assertXPathContent(pXmlDoc, "(//w:t)[4]", "c");
}
+DECLARE_OOXMLEXPORT_TEST(testOO67471, "ooo67471-2.odt")
+{
+ if (xmlDocPtr pXmlDoc = parseExport("word/document.xml"))
+ assertXPathContent(pXmlDoc, "(//w:t)[2]", "B");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */