diff options
| author | nd101 <Fong@nd.com.cn> | 2019-08-14 16:07:22 +0800 |
|---|---|---|
| committer | Regina Henschel <rb.henschel@t-online.de> | 2019-08-23 13:20:08 +0200 |
| commit | e2b16c5660a8f3f72c1d1ba74ce565e8628b3dbb (patch) | |
| tree | 985db65cf79ed2e813480823c1b1baa206ff2d32 /oox | |
| parent | 54b47a81fdba4fb42f7f5eaee65292014567cd29 (diff) | |
tdf#126741 - fix dash dot dot line style import problem, for pptx
To make it consistent with MS PowerPoint, make the dash dot dot
line start with dash instead of dots.
Based on Regina Henschel's technical analysis and code pointers,
but only make change to the lgDashDotDot case and leave
everything else untouched.
Change-Id: Ide533a562005c617eca9d556a63b6aec39017e93
Reviewed-on: https://gerrit.libreoffice.org/77443
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/lineproperties.cxx | 2 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index a7ea2396e65d..1139273a1831 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -67,7 +67,7 @@ void lclConvertPresetDash(LineDash& orLineDash, sal_Int32 nPresetDash, sal_Int32 case XML_lgDash: lclSetDashData( orLineDash, 0, 0, 1, 8, 3 ); break; case XML_lgDashDot: lclSetDashData( orLineDash, 1, 1, 1, 8, 3 ); break; - case XML_lgDashDotDot: lclSetDashData( orLineDash, 2, 1, 1, 8, 3 ); break; + case XML_lgDashDotDot: lclSetDashData( orLineDash, 1, 8, 2, 1, 3 ); break; case XML_sysDot: lclSetDashData( orLineDash, 1, 1, 0, 0, 1 ); break; case XML_sysDash: lclSetDashData( orLineDash, 0, 0, 1, 3, 1 ); break; diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 6f975a298e50..27dd7e5b2a16 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -897,7 +897,7 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc { mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "lgDashDot"); } - else if (aLineDash.Dots == 2 && relDotLen == 1 && aLineDash.Dashes == 1 && relDashLen == 8 && relDistance == 3) + else if (aLineDash.Dots == 1 && relDotLen == 8 && aLineDash.Dashes == 2 && relDashLen == 1 && relDistance == 3) { mpFS->singleElementNS(XML_a, XML_prstDash, XML_val, "lgDashDotDot"); } |