From 5bdc78f65da36d65e94de1e2dde5659f0563f08f Mon Sep 17 00:00:00 2001 From: Adam Kovacs Date: Thu, 15 Nov 2018 13:36:45 +0100 Subject: [PATCH] tdf#121435 OOXML export: fixing linestyle export in charts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixing linestyle export of chart wall (plot area) and chart page. Change-Id: Id5265110352d393d9c3e01ff55cea0770d4e0cef Reviewed-on: https://gerrit.libreoffice.org/63418 Tested-by: Jenkins Reviewed-by: László Németh Tested-by: László Németh --- oox/source/export/drawingml.cxx | 27 ++++++++++++------ .../data/Chart_Plot_BorderLine_Style.docx | Bin 0 -> 25114 bytes sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 14 +++++++++ 3 files changed, 33 insertions(+), 8 deletions(-) create mode 100755 sw/qa/extras/ooxmlexport/data/Chart_Plot_BorderLine_Style.docx diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 58164ba4065a..a797adbc1f1e 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -671,15 +671,26 @@ void DrawingML::WriteOutline( const Reference& rXPropSet, Referenc aAny >>= aLineDash; } } - bDashSet = true; - if (aLineDash.Style == DashStyle_ROUND || aLineDash.Style == DashStyle_ROUNDRELATIVE) - { - cap = "rnd"; - } - - SAL_INFO("oox.shape", "dash dots: " << aLineDash.Dots << " dashes: " << aLineDash.Dashes - << " dotlen: " << aLineDash.DotLen << " dashlen: " << aLineDash.DashLen << " distance: " << aLineDash.Distance); } + else + { + //export the linestyle of chart wall (plot area) and chart page + OUString aLineDashName; + GET(aLineDashName, LineDashName); + if (!aLineDashName.isEmpty() && xModel) { + css::uno::Any aAny = getLineDash(xModel, aLineDashName); + aAny >>= aLineDash; + } + } + bDashSet = true; + if (aLineDash.Style == DashStyle_ROUND || aLineDash.Style == DashStyle_ROUNDRELATIVE) + { + cap = "rnd"; + } + + SAL_INFO("oox.shape", "dash dots: " << aLineDash.Dots << " dashes: " << aLineDash.Dashes + << " dotlen: " << aLineDash.DotLen << " dashlen: " << aLineDash.DashLen << " distance: " << aLineDash.Distance); + SAL_FALLTHROUGH; case drawing::LineStyle_SOLID: default: diff --git a/sw/qa/extras/ooxmlexport/data/Chart_Plot_BorderLine_Style.docx b/sw/qa/extras/ooxmlexport/data/Chart_Plot_BorderLine_Style.docx new file mode 100755 index 0000000000000000000000000000000000000000..d1f0f97f10633658508002e649530e6e2d0384bb GIT binary patch literal 25114 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 YcEJqa*FBLY4>hl?M%A8lJATIe8(;t4OaK4? literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index c7e6bac3a8ea..d7fd52d87b6d 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -747,6 +747,20 @@ DECLARE_OOXMLEXPORT_TEST(testChart_BorderLine_Style, "Chart_BorderLine_Style.doc assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser[3]/c:spPr/a:ln/a:prstDash", "val", "dash"); } +DECLARE_OOXMLEXPORT_TEST(testChart_Plot_BorderLine_Style, "Chart_Plot_BorderLine_Style.docx") +{ + /* DOCX containing Chart wall (plot area) and Chart Page with BorderLine Style as Dash Type + * should get preserved inside an XML tag with value "dash", "sysDot, "lgDot", etc. + */ + xmlDocPtr pXmlDoc = parseExport("word/charts/chart1.xml"); + if (!pXmlDoc) + return; + + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:spPr/a:ln/a:prstDash", "val", "lgDashDot"); + assertXPath(pXmlDoc, "/c:chartSpace/c:spPr/a:ln/a:prstDash", "val", "sysDash"); + +} + DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedEmptyParagraph, "testTrackChangesDeletedEmptyParagraph.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml");