summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2021-04-26 15:16:49 +0200
committerLuboš Luňák <l.lunak@collabora.com>2021-04-29 16:05:34 +0200
commit5d4e450a7d64d3dc1caf34544dbfa35f4641d5c3 (patch)
treeda94d52fbadd90b64e3e90c5da0b4fb4cb4aa893 /oox
parent1d036d1a58a46d46ca38eaa8ba438015a54008f6 (diff)
Revert "tdf#136957 Use bigger dots for better handling in presentation mode."
This change was a workaround and a follow-up commit will handle the problem in a better way. This reverts commit 5d80f679e1891f98ef964efa1166c90d001c5806. Change-Id: I24a98a0828d3b6fbd014d58f37bf4da40d7dfdfd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114711 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/lineproperties.cxx4
-rw-r--r--oox/source/export/drawingml.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 87c502f96f6b..451da4c6aa26 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -470,9 +470,9 @@ void LineProperties::pushToPropMap( ShapePropertyMap& rPropMap,
// Cannot use -100 because that results in 0 length in some cases and
// LibreOffice interprets 0 length as 100%.
if (aLineDash.DotLen >= 100 || aLineDash.DashLen >= 100)
- aLineDash.Distance += 96;
+ aLineDash.Distance += 99;
if (aLineDash.DotLen >= 100)
- aLineDash.DotLen -= 96;
+ aLineDash.DotLen -= 99;
if (aLineDash.DashLen >= 100)
aLineDash.DashLen -= 99;
}
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 07dad1fb8b75..5b16931da1d3 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -974,8 +974,8 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc
sal_uInt32 nDistance = aLineDash.Distance;
if (aLineCap != LineCap_BUTT && nDistance >= 99)
{
- nDistance -= 96;
- nDotLen += 96;
+ nDistance -= 99;
+ nDotLen += 99;
if (nDashLen > 0)
nDashLen += 99;
}