diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-20 16:48:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-20 17:08:05 +0100 |
| commit | 4eff3e7c455e8db2c00b7ee5eb1d2296b45d2823 (patch) | |
| tree | f619be51c35da0e3ccd13faf8e28c46d340c341a /sw/qa | |
| parent | 799fd7552f544834ae2d3b77c3ce69e36590b63a (diff) | |
Related: tdf#90681 table model can have truly empty cells
this time the missing cells are on the left
Change-Id: I55a5aa60c8d06b25b0c48b3f6a683694adca8e6a
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf90681-1.odt (renamed from sw/qa/extras/ooxmlexport/data/tdf90681.odt) | bin | 13089 -> 13089 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf90681-2.odt | bin | 0 -> 16590 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 13 |
3 files changed, 12 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf90681.odt b/sw/qa/extras/ooxmlexport/data/tdf90681-1.odt Binary files differindex 009e006caf86..009e006caf86 100644 --- a/sw/qa/extras/ooxmlexport/data/tdf90681.odt +++ b/sw/qa/extras/ooxmlexport/data/tdf90681-1.odt diff --git a/sw/qa/extras/ooxmlexport/data/tdf90681-2.odt b/sw/qa/extras/ooxmlexport/data/tdf90681-2.odt Binary files differnew file mode 100644 index 000000000000..3d9d46fc4a68 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf90681-2.odt diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index ee1a075a867a..49a1d66205bd 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -228,7 +228,7 @@ DECLARE_OOXMLEXPORT_TEST(testFloatingTable, "fdo77887.docx") } -DECLARE_OOXMLEXPORT_TEST(testOldComplexMerge, "tdf90681.odt") +DECLARE_OOXMLEXPORT_TEST(testOldComplexMergeRight, "tdf90681-1.odt") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); @@ -241,6 +241,17 @@ DECLARE_OOXMLEXPORT_TEST(testOldComplexMerge, "tdf90681.odt") assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc[2]/w:tcPr/w:vMerge", "val", "continue"); } +DECLARE_OOXMLEXPORT_TEST(testOldComplexMergeleft, "tdf90681-2.odt") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + + if (!pXmlDoc) + return; + + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:vMerge", "val", "restart"); + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[2]/w:tc[1]/w:tcPr/w:vMerge", "val", "continue"); +} + DECLARE_OOXMLEXPORT_TEST(testTablePreferredWidth, "tablePreferredWidth.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); |