[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - svgio/qa

[Libreoffice Gerrit user]

 svgio/qa/cppunit/SvgRead.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8a82814679c986e5627151ae84340974c468ac18
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Mar 11 22:18:14 2019 +0300
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Mar 11 21:26:07 2019 +0100

    Fix build
    
    [CXX] svgio/qa/cppunit/SvgRead.cxx
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(103): error C2440: '<function-style-cast>': cannot convert from 'Color' to 'sal_Int32'
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(103): note: No user-defined-conversion operator available that can perform this conversion, or the operator
    cannot be called
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(103): error C2672: 'CppUnit::assertEquals': no matching overloaded function found
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(103): error C2780: 'void CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string
    &)': expects 4 arguments - 3 provided
    C:\lo\src\core2\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(127): note: see declaration of 'CppUnit::assertEquals'
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(105): error C2440: '<function-style-cast>': cannot convert from 'Color' to 'sal_Int32'
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(105): note: No user-defined-conversion operator available that can perform this conversion, or the operator
    cannot be called
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(105): error C2672: 'CppUnit::assertEquals': no matching overloaded function found
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(105): error C2780: 'void CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string
    &)': expects 4 arguments - 3 provided
    C:\lo\src\core2\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(127): note: see declaration of 'CppUnit::assertEquals'
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(134): error C2440: '<function-style-cast>': cannot convert from 'Color' to 'sal_Int32'
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(134): note: No user-defined-conversion operator available that can perform this conversion, or the operator
    cannot be called
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(134): error C2672: 'CppUnit::assertEquals': no matching overloaded function found
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(134): error C2780: 'void CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string
    &)': expects 4 arguments - 3 provided
    C:\lo\src\core2\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(127): note: see declaration of 'CppUnit::assertEquals'
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(136): error C2440: '<function-style-cast>': cannot convert from 'Color' to 'sal_Int32'
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(136): note: No user-defined-conversion operator available that can perform this conversion, or the operator
    cannot be called
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(136): error C2672: 'CppUnit::assertEquals': no matching overloaded function found
    C:/lo/src/core2/svgio/qa/cppunit/SvgRead.cxx(136): error C2780: 'void CppUnit::assertEquals(const T &,const T &,CppUnit::SourceLine,const std::string
    &)': expects 4 arguments - 3 provided
    C:\lo\src\core2\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(127): note: see declaration of 'CppUnit::assertEquals'
    make[1]: *** [C:/lo/src/core2/solenv/gbuild/LinkTarget.mk:293: C:/lo/src/core2/workdir/CxxObject/svgio/qa/cppunit/SvgRead.o] Error 2
    make: *** [Makefile:166: CppunitTest_svgio_read] Error 2
    
    Change-Id: I4e1cf222a416772f1920194ccfcf459f40b577d6
    Reviewed-on: https://gerrit.libreoffice.org/69064
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/svgio/qa/cppunit/SvgRead.cxx b/svgio/qa/cppunit/SvgRead.cxx
index 996be9d21f08..8b13bd68bb45 100644
--- a/svgio/qa/cppunit/SvgRead.cxx
+++ b/svgio/qa/cppunit/SvgRead.cxx
@@ -100,9 +100,9 @@ void TestParsing::testSimpleRectangle()
     CPPUNIT_ASSERT_EQUAL(basegfx::B2DRange(10, 10, 110, 110), pDrawRect->maRectangle);
     CPPUNIT_ASSERT_EQUAL(3.0, pDrawRect->mnStrokeWidth);
     CPPUNIT_ASSERT(bool(pDrawRect->mpStrokeColor));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff0000), sal_Int32(Color(*pDrawRect->mpStrokeColor)));
+    CPPUNIT_ASSERT_EQUAL(ColorData(0xff0000), Color(*pDrawRect->mpStrokeColor).GetRGBColor());
     CPPUNIT_ASSERT(bool(pDrawRect->mpFillColor));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00cc00), sal_Int32(Color(*pDrawRect->mpFillColor)));
+    CPPUNIT_ASSERT_EQUAL(ColorData(0x00cc00), Color(*pDrawRect->mpFillColor).GetRGBColor());
 }
 
 void TestParsing::testPath()
@@ -131,9 +131,9 @@ void TestParsing::testPath()
                          basegfx::utils::exportToSvgD(pDrawPath->maPolyPolygon, true, true, false));
     CPPUNIT_ASSERT_EQUAL(0.0, pDrawPath->mnStrokeWidth);
     CPPUNIT_ASSERT(bool(pDrawPath->mpStrokeColor));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0xffffff), sal_Int32(Color(*pDrawPath->mpStrokeColor)));
+    CPPUNIT_ASSERT_EQUAL(ColorData(0xffffff), Color(*pDrawPath->mpStrokeColor).GetRGBColor());
     CPPUNIT_ASSERT(bool(pDrawPath->mpFillColor));
-    CPPUNIT_ASSERT_EQUAL(sal_Int32(0x007aff), sal_Int32(Color(*pDrawPath->mpFillColor)));
+    CPPUNIT_ASSERT_EQUAL(ColorData(0x007aff), Color(*pDrawPath->mpFillColor).GetRGBColor());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestParsing);