diff options
| author | László Németh <nemeth@numbertext.org> | 2020-01-27 12:14:52 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-01-27 17:06:53 +0100 |
| commit | 8ffc1299ebf83450e67cf2a89304859e2558cd27 (patch) | |
| tree | 6c5b1ec12afb43729d38c7bad99a9e945a049a3b /sw | |
| parent | 2be03a8e8159165d6a2f911d0c94f55b3d9e41d4 (diff) | |
tdf#95033 DOCX import: apply tblPrEx table border
exceptions of table rows, fixing for example
missing cell borders.
Change-Id: Id66af2706f564f46a1afd04bad65d1bf086a3232
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87514
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf95033.docx | bin | 0 -> 22773 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 17 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf95033.docx b/sw/qa/extras/ooxmlexport/data/tdf95033.docx Binary files differnew file mode 100644 index 000000000000..5d2cc73db9b1 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf95033.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index b59a14a89619..3fb80c0850d1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -593,6 +593,23 @@ DECLARE_OOXMLEXPORT_TEST(testfdo80097, "fdo80097.docx") assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/w:insideV",0); } +DECLARE_OOXMLEXPORT_TEST(testTdf95033, "tdf95033.docx") +{ + //tdf#95033 : Table borders defined by row-level tblPrEx are not getting preserved. + + xmlDocPtr pXmlDocument = parseExport("word/document.xml"); + if (!pXmlDocument) + return; + + //Not disabled table cell borders + assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[5]/w:tc[1]/w:tcPr/w:tcBorders/w:start[@w:val = 'nil']", 0); + assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[5]/w:tc[2]/w:tcPr/w:tcBorders/w:end[@w:val = 'nil']", 0); + assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[9]/w:tc[1]/w:tcPr/w:tcBorders/w:start[@w:val = 'nil']", 0); + assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[9]/w:tc[2]/w:tcPr/w:tcBorders/w:end[@w:val = 'nil']", 0); + assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[9]/w:tc[1]/w:tcPr/w:tcBorders/w:bottom[@w:val = 'nil']", 0); + assertXPath(pXmlDocument, "/w:document/w:body/w:tbl/w:tr[9]/w:tc[2]/w:tcPr/w:tcBorders/w:bottom[@w:val = 'nil']", 0); +} + DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo77129, "fdo77129.docx") { // The problem was that text after TOC field was missing if footer reference comes in field. |