diff options
| author | Adam Kovacs <christo161@gmail.com> | 2018-08-16 09:32:17 -0400 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-08-17 09:37:05 +0200 |
| commit | f5f235051055d24c8aced602078c54261603efea (patch) | |
| tree | 9a93d77ce68e8aaa6aca8c165dd7887c5df5175a /sw | |
| parent | 849cedc47333416d05d93801701c7751e080f2eb (diff) | |
tdf108064 OOXML export: keep preset dashes in shape outlines
Extending commit d7551e32609d0e0de8ac419576ca42d65c5015be
to all default MSO 2016 preset dashes:
Saving an ooxml file with LibreOffice now preserves the
prstDash tags with the values sysDot, sysDash, dash, dashDot,
lgDash, lgDashDot, lgDashDotDot, instead of converting them
to custDash tags.
Note: the import of the preset dash outlines are still not
relative to the line width, in spite of their original
behaviour in MSO.
Change-Id: I65eaf06952a968019495664067010c874fce1352
Reviewed-on: https://gerrit.libreoffice.org/59203
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Tested-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx | bin | 15661 -> 22017 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 10 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx b/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx Binary files differindex 9256c3ec7a4e..d7997ddc63c6 100644 --- a/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx +++ b/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index 3a20b765f934..a41dd05501f4 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -840,13 +840,19 @@ DECLARE_OOXMLEXPORT_TEST(testAlignForShape,"Shape.docx") DECLARE_OOXMLEXPORT_TEST(testLineStyle_DashType, "LineStyle_DashType.docx") { /* DOCX contatining Shape with LineStyle as Dash Type should get preserved inside - * an XMl tag <a:prstDash> with value "dash". + * an XMl tag <a:prstDash> with value "dash", "sysDot", "lgDot", etc. */ xmlDocPtr pXmlDoc = parseExport("word/document.xml"); if (!pXmlDoc) return; - assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "dash"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[7]/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "lgDashDotDot"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[6]/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "lgDashDot"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[5]/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "lgDash"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[4]/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "dashDot"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[3]/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "dash"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "sysDash"); + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "sysDot"); } DECLARE_OOXMLEXPORT_TEST(testGradientFillPreservation, "gradient-fill-preservation.docx") |