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

[Luboš Luňák (via logerrit)]

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

New commits:
commit 5d4e450a7d64d3dc1caf34544dbfa35f4641d5c3
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Apr 26 15:16:49 2021 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Thu Apr 29 16:05:34 2021 +0200

    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 at collabora.com>

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;
             }
diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx
index 4f2501da991a..9a1ab0a52c82 100644
--- a/sd/qa/unit/uiimpress.cxx
+++ b/sd/qa/unit/uiimpress.cxx
@@ -650,19 +650,9 @@ 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);
-
-    // 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_ASSERT_DOUBLES_EQUAL_MESSAGE("Dash length", 2822, fDashLength, 12);
 }
 
 CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testSpellOnlineParameter)