[Libreoffice-commits] core.git: oox/source sd/qa

[Gülşah Köse (via logerrit)]

 oox/source/drawingml/lineproperties.cxx |    4 ++--
 oox/source/export/drawingml.cxx         |    4 ++--
 sd/qa/unit/uiimpress.cxx                |   14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit 5d80f679e1891f98ef964efa1166c90d001c5806
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Mon Nov 30 13:29:19 2020 +0300
Commit:     Gülşah Köse <gulsah.kose at collabora.com>
CommitDate: Wed Dec 2 14:06:46 2020 +0100

    tdf#136957 Use bigger dots for better handling in presentation mode.
    
    3 pt bigger dots are used. Human eye can't catch this
    change so we will see same dots in edit mode and presentation mode.
    
    Change-Id: I4a56406f4eb7a6832075a09a4d2f092bd689e9cb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106855
    Tested-by: Jenkins
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>

diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 451da4c6aa26..87c502f96f6b 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 += 99;
+                aLineDash.Distance += 96;
             if (aLineDash.DotLen >= 100)
-                aLineDash.DotLen -= 99;
+                aLineDash.DotLen -= 96;
             if (aLineDash.DashLen >= 100)
                 aLineDash.DashLen -= 99;
         }
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index eca53a92d5a8..f309e1541409 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -966,8 +966,8 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc
             sal_uInt32 nDistance = aLineDash.Distance;
             if (aLineCap != LineCap_BUTT && nDistance >= 99)
             {
-                nDistance -= 99;
-                nDotLen += 99;
+                nDistance -= 96;
+                nDotLen += 96;
                 if (nDashLen > 0)
                     nDashLen += 99;
             }
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index fbd23a24eda0..2b492be3fffd 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -375,9 +375,19 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf134053)
     // Because 0% is not possible as dash length (as of June 2020) 1% is used in the fix.
     // For that a larger delta is here allowed to the ideal value than needed for
     // rounding errors.
-    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Distance", 2117, fDistance, 12);
     CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Dot length", 706, fDotLength, 12);
-    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Dash length", 2822, fDashLength, 12);
+
+    // tdf#136957 (dotted lines are  disappearing in presentation mode)
+    // Test value used as 2089 instead of 2117 for tdf#136957 workaround.
+    // If this test fails as Expected: 2089 Actual:2117
+    // plaese test tdf#136957 manually and use 2117 as test value again.
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Distance", 2089, fDistance, 12);
+
+    // tdf#136957 (dotted lines are  disappearing in presentation mode)
+    // Test value used as 2854 instead of 2822 for tdf#136957 workaround.
+    // If this test fails as Expected: 2854 Actual:2822
+    // plaese test tdf#136957 manually and use 2822 as test value again.
+    CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Dash length", 2854, fDashLength, 12);
 }
 
 CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testSpellOnlineParameter)