[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - sc/qa

[Mike Kaganski (via logerrit)]

 sc/qa/unit/ThemeImportExportTest.cxx |   26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 48720d869df42bdcf2d9444e508068e91a3bd9c3
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Jul 4 11:50:01 2023 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Fri Sep 8 15:19:04 2023 +0200

    Fix build on Win64, where int != sal_Int32
    
    Change-Id: Id835da668042a656ace0f09a7fa9bc852b968b3e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153926
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    (cherry picked from commit b68e4a2d0179558180085bfe28a32a1510aeb3e1)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154251
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156703
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sc/qa/unit/ThemeImportExportTest.cxx 
b/sc/qa/unit/ThemeImportExportTest.cxx
index 7d0eb47ee2c9..e8e1a31dbbff 100644
--- a/sc/qa/unit/ThemeImportExportTest.cxx
+++ b/sc/qa/unit/ThemeImportExportTest.cxx
@@ -194,9 +194,9 @@ void checkCellBackgroundThemeColor(ScDocument* pDoc)
         auto& rTransformations = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(2), rTransformations.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-        CPPUNIT_ASSERT_EQUAL(20, roundToPercent(rTransformations[0].mnValue));
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(20), 
roundToPercent(rTransformations[0].mnValue));
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumOff, 
rTransformations[1].meType);
-        CPPUNIT_ASSERT_EQUAL(80, roundToPercent(rTransformations[1].mnValue));
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(80), 
roundToPercent(rTransformations[1].mnValue));
     }
 
     // A3
@@ -213,7 +213,7 @@ void checkCellBackgroundThemeColor(ScDocument* pDoc)
         auto& rTransformations = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(1), rTransformations.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-        CPPUNIT_ASSERT_EQUAL(50, roundToPercent(rTransformations[0].mnValue));
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(50), 
roundToPercent(rTransformations[0].mnValue));
     }
 }
 
@@ -265,9 +265,9 @@ void checkCellTextThemeColor(ScDocument* pDoc)
         auto& rTransformations = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(2), rTransformations.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-        CPPUNIT_ASSERT_EQUAL(60, roundToPercent(rTransformations[0].mnValue));
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(60), 
roundToPercent(rTransformations[0].mnValue));
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumOff, 
rTransformations[1].meType);
-        CPPUNIT_ASSERT_EQUAL(40, roundToPercent(rTransformations[1].mnValue));
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(40), 
roundToPercent(rTransformations[1].mnValue));
     }
 
     // B3
@@ -284,7 +284,7 @@ void checkCellTextThemeColor(ScDocument* pDoc)
         auto& rTransformations = aComplexColor.getTransformations();
         CPPUNIT_ASSERT_EQUAL(size_t(1), rTransformations.size());
         CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-        CPPUNIT_ASSERT_EQUAL(50, roundToPercent(rTransformations[0].mnValue));
+        CPPUNIT_ASSERT_EQUAL(sal_Int32(50), 
roundToPercent(rTransformations[0].mnValue));
     }
 }
 
@@ -350,9 +350,9 @@ void checkCellBorderThemeColor(ScDocument* pDoc)
             auto& rTransformations = aComplexColor.getTransformations();
             CPPUNIT_ASSERT_EQUAL(size_t(2), rTransformations.size());
             CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-            CPPUNIT_ASSERT_EQUAL(20, 
roundToPercent(rTransformations[0].mnValue));
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(20), 
roundToPercent(rTransformations[0].mnValue));
             CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumOff, 
rTransformations[1].meType);
-            CPPUNIT_ASSERT_EQUAL(80, 
roundToPercent(rTransformations[1].mnValue));
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(80), 
roundToPercent(rTransformations[1].mnValue));
         }
         {
             auto* pTop = pBoxItem->GetRight();
@@ -363,9 +363,9 @@ void checkCellBorderThemeColor(ScDocument* pDoc)
             auto& rTransformations = aComplexColor.getTransformations();
             CPPUNIT_ASSERT_EQUAL(size_t(2), rTransformations.size());
             CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-            CPPUNIT_ASSERT_EQUAL(20, 
roundToPercent(rTransformations[0].mnValue));
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(20), 
roundToPercent(rTransformations[0].mnValue));
             CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumOff, 
rTransformations[1].meType);
-            CPPUNIT_ASSERT_EQUAL(80, 
roundToPercent(rTransformations[1].mnValue));
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(80), 
roundToPercent(rTransformations[1].mnValue));
         }
         {
             auto* pTop = pBoxItem->GetBottom();
@@ -376,7 +376,7 @@ void checkCellBorderThemeColor(ScDocument* pDoc)
             auto& rTransformations = aComplexColor.getTransformations();
             CPPUNIT_ASSERT_EQUAL(size_t(1), rTransformations.size());
             CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-            CPPUNIT_ASSERT_EQUAL(50, 
roundToPercent(rTransformations[0].mnValue));
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(50), 
roundToPercent(rTransformations[0].mnValue));
         }
     }
 
@@ -400,7 +400,7 @@ void checkCellBorderThemeColor(ScDocument* pDoc)
             auto& rTransformations = aComplexColor.getTransformations();
             CPPUNIT_ASSERT_EQUAL(size_t(1), rTransformations.size());
             CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-            CPPUNIT_ASSERT_EQUAL(50, 
roundToPercent(rTransformations[0].mnValue));
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(50), 
roundToPercent(rTransformations[0].mnValue));
         }
 
         {
@@ -412,7 +412,7 @@ void checkCellBorderThemeColor(ScDocument* pDoc)
             auto& rTransformations = aComplexColor.getTransformations();
             CPPUNIT_ASSERT_EQUAL(size_t(1), rTransformations.size());
             CPPUNIT_ASSERT_EQUAL(model::TransformationType::LumMod, 
rTransformations[0].meType);
-            CPPUNIT_ASSERT_EQUAL(50, 
roundToPercent(rTransformations[0].mnValue));
+            CPPUNIT_ASSERT_EQUAL(sal_Int32(50), 
roundToPercent(rTransformations[0].mnValue));
         }
     }
 }