diff options
| author | László Németh <nemeth@numbertext.org> | 2020-06-09 14:42:26 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-06-10 09:08:40 +0200 |
| commit | 20ba8d8d9f4fcf7d5826fcb3366a9bff0d6a8ca1 (patch) | |
| tree | 159fdc21a197ae4ff52c307be0af877bd3a3be13 /sw/qa | |
| parent | 0310c591eb5f4010de8f6d12298491d9c13634a3 (diff) | |
tdf#131070 DOCX import: fix indentation of direct numbering
Indentation came from direct numbering has precedence over
table style.
Also paragraph style based right indentation affects DOCX list
items with not paragraph style based numbering, unlike Writer.
Keep all indentation values using direct paragraph formatting.
Change-Id: Ia66645269a4fcd06f0be4f02c775007c83d22a0b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95954
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport9.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx index 8847b6413a54..07b6ebb8b69d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx @@ -374,6 +374,20 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf118812, "tdf118812_tableStyles-compre assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[6]/w:tc/w:p/w:r[2]/w:rPr/w:color", 1); assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[6]/w:tc/w:p/w:r[2]/w:rPr/w:color", "val", "AAAA00"); assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[6]/w:tc/w:p/w:r[2]/w:rPr/w:sz", "val", "16"); + + // tdf#131070 keep paragraph style based right indentation with indentation of direct numbering + // cell A7 - This was <w:ind w:start="1440" w:hanging="0"/> + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[7]/w:tc/w:p/w:pPr/w:ind", 0); + // cell A8 + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[8]/w:tc/w:p/w:pPr/w:ind", "start", "714"); + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[8]/w:tc/w:p/w:pPr/w:ind", "end", "1701"); + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[8]/w:tc/w:p/w:pPr/w:ind", "hanging", "357"); + // cell A9 + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[9]/w:tc/w:p/w:pPr/w:ind", "end", "1440"); + // This was 1440 + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[9]/w:tc/w:p/w:pPr/w:ind", "start", "720"); + // This was 0 + assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[9]/w:tc/w:p/w:pPr/w:ind", "hanging", "360"); } DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf107626, "tdf107626.odt") |