diff options
| author | László Németh <nemeth@numbertext.org> | 2020-02-04 19:31:41 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-02-12 14:16:30 +0100 |
| commit | f15d67442972c5f69c71925a6bfa5aa1a39d54eb (patch) | |
| tree | 736cbe30388b5fdbad855919ea497e74e55214e9 /sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | |
| parent | 1f625b3f74c6e6e5ef345a3e017061be918e443b (diff) | |
tdf#129575 DOCX import: fix table style preference
handling by recognizing docDefault properties
instead of default-value based heuristics.
Change-Id: I3bab9d85d77d0e5f1c357121b1caf02cbe4899c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88457
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa/extras/ooxmlexport/ooxmlexport6.cxx')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index 3b5726dceb28..45bcc9ac5f27 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -459,9 +459,9 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128752, "tdf128752.docx") DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf119054, "tdf119054.docx") { xmlDocPtr pXmlDoc = parseExport(); - // Don't overwrite before and after spacing of Heading2 by table style - assertXPathNoAttribute(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "before"); - assertXPathNoAttribute(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "after"); + // Overwrite applied table style with before and after spacing of Heading2 + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "before", "0"); + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "after", "360"); // Use table style based single line spacing instead of the docDefaults' 254 assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:p[1]/w:pPr/w:spacing", "line", "240"); } |