core.git: xmloff/qa

[Ilmari Lauhakangas (via logerrit)]

 xmloff/qa/unit/style.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9798f383f82897b0021665f50f3a9f8153febbe8
Author:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
AuthorDate: Tue Feb 13 14:41:13 2024 +0200
Commit:     Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
CommitDate: Wed Feb 14 08:22:29 2024 +0100

    tdf#141908 replace usage of sal_Int32 with colors in xmloff
    
    Change-Id: Ia2661fa0f6864d6553e5cca7469e1d351bb06d17
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163305
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>

diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx
index 178b0f216154..3bf1391d842a 100644
--- a/xmloff/qa/unit/style.cxx
+++ b/xmloff/qa/unit/style.cxx
@@ -371,8 +371,8 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMCGR_OldToNew)
     CPPUNIT_ASSERT_EQUAL(u"red2yellow"_ustr, sGradientName);
     awt::Gradient2 aGradient;
     xShapeProperties->getPropertyValue("FillGradient") >>= aGradient;
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF0000), aGradient.StartColor);
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFFFF00), aGradient.EndColor);
+    CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, Color(ColorTransparency, 
aGradient.StartColor));
+    CPPUNIT_ASSERT_EQUAL(COL_YELLOW, Color(ColorTransparency, 
aGradient.EndColor));
 
     // Test new properties
     auto aColorStopSeq = aGradient.ColorStops;
@@ -427,8 +427,8 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, 
testMCGR_OldToNew_opacity)
     // The old properties need to be still available, as they might be used in 
macros.
     awt::Gradient2 aGradient;
     xShapeProperties->getPropertyValue("FillTransparenceGradient") >>= 
aGradient;
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xE5E5E5), aGradient.StartColor);
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0), aGradient.EndColor);
+    CPPUNIT_ASSERT_EQUAL(Color(0xE5E5E5), Color(ColorTransparency, 
aGradient.StartColor));
+    CPPUNIT_ASSERT_EQUAL(COL_BLACK, Color(ColorTransparency, 
aGradient.EndColor));
     CPPUNIT_ASSERT_EQUAL(sal_Int16(20), aGradient.Border);
     CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.XOffset);
     CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.YOffset);
@@ -493,8 +493,8 @@ CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMCGR_threeStops)
     CPPUNIT_ASSERT_EQUAL(u"threeStops"_ustr, sGradientName);
     awt::Gradient2 aGradient;
     xShapeProperties->getPropertyValue("FillGradient") >>= aGradient;
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFF0000), aGradient.StartColor);
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xFFFF00), aGradient.EndColor);
+    CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, Color(ColorTransparency, 
aGradient.StartColor));
+    CPPUNIT_ASSERT_EQUAL(COL_YELLOW, Color(ColorTransparency, 
aGradient.EndColor));
     CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_SQUARE, aGradient.Style);
     CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aGradient.XOffset);
     CPPUNIT_ASSERT_EQUAL(sal_Int16(50), aGradient.YOffset);