sc/qa/unit/scshapetest.cxx |   12 ------------
 1 file changed, 12 deletions(-)

New commits:
commit 424a293664cbdffcceaa79756d59bb2d29080613
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Jun 22 20:46:11 2022 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Jun 22 21:41:47 2022 +0200

    Re-enable the test
    
    After commit 7d5dcf5f547e29d61e788b88f7a3f7b4feafb6b2
      Author Mike Kaganski <mike.kagan...@collabora.com>
      Date   Wed Jun 22 16:22:50 2022 +0300
        Fix shape rectangle calculation
    
    the test should not fail anymore, both on macOS, and with
    non-default DPI.
    
    This reverts commit     5c6139ac36134a21345525c21e167a356b0892b9
      Author Caolán McNamara <caol...@redhat.com>
      Date   Thu Dec 31 19:40:17 2020 +0000
        disable contantly failing test
    
    and commit d0f6c9f924fdbeed4c466e3a6eff7d6980ebc659
      Author Noel Grandin <n...@peralex.com>
      Date   Wed Jan 06 09:22:57 2021 +0200
        exclude more tests for non-default DPI
    
    Change-Id: I8e4b872d8ef0b3e695c7ce0b87598c4a7effe94a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136294
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/qa/unit/scshapetest.cxx b/sc/qa/unit/scshapetest.cxx
index dc47be21b0d3..8417d0bf51b9 100644
--- a/sc/qa/unit/scshapetest.cxx
+++ b/sc/qa/unit/scshapetest.cxx
@@ -55,10 +55,7 @@ public:
     void testTdf137033_FlipHori_Resize();
     void testTdf137033_RotShear_ResizeHide();
     void testTdf137033_RotShear_Hide();
-// this test has starting failing under OSX
-#if !defined MACOSX
     void testTdf137576_LogicRectInDefaultMeasureline();
-#endif
     void testTdf137576_LogicRectInNewMeasureline();
     void testMeasurelineHideColSave();
     void testHideColsShow();
@@ -85,10 +82,7 @@ public:
     CPPUNIT_TEST(testTdf137033_FlipHori_Resize);
     CPPUNIT_TEST(testTdf137033_RotShear_ResizeHide);
     CPPUNIT_TEST(testTdf137033_RotShear_Hide);
-// this test has starting failing under OSX
-#if !defined MACOSX
     CPPUNIT_TEST(testTdf137576_LogicRectInDefaultMeasureline);
-#endif
     CPPUNIT_TEST(testTdf137576_LogicRectInNewMeasureline);
     CPPUNIT_TEST(testMeasurelineHideColSave);
     CPPUNIT_TEST(testHideColsShow);
@@ -769,13 +763,8 @@ void ScShapeTest::testTdf137033_RotShear_Hide()
     pDocSh->DoClose();
 }
 
-// this test has starting failing under OSX
-#if !defined MACOSX
 void ScShapeTest::testTdf137576_LogicRectInDefaultMeasureline()
 {
-    if (!IsDefaultDPI())
-        return;
-
     // Error was, that the empty logical rectangle of a default measure line 
(Ctrl+Click)
     // resulted in zeros in NonRotatedAnchor and a wrong position when 
reloading.
 
@@ -828,7 +817,6 @@ void 
ScShapeTest::testTdf137576_LogicRectInDefaultMeasureline()
 
     pDocSh->DoClose();
 }
-#endif
 
 void ScShapeTest::testTdf137576_LogicRectInNewMeasureline()
 {

Reply via email to