From af14b2096e363e8f09c2da749f9199bebb7cbb40 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Thu, 6 Feb 2020 18:20:28 +0100 Subject: [PATCH] use color instead of int MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7a837b61af666b6e13519df43255ff309d54f170 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88123 Tested-by: Jenkins Reviewed-by: Xisco Faulí --- lotuswordpro/CppunitTest_lotuswordpro_import_test.mk | 1 + lotuswordpro/qa/cppunit/import_test.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk b/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk index 325b1db2b921..315fea09a04d 100644 --- a/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk +++ b/lotuswordpro/CppunitTest_lotuswordpro_import_test.mk @@ -21,6 +21,7 @@ $(eval $(call gb_CppunitTest_use_libraries,lotuswordpro_import_test, \ cppuhelper \ sal \ test \ + tl \ unotest \ vcl \ )) diff --git a/lotuswordpro/qa/cppunit/import_test.cxx b/lotuswordpro/qa/cppunit/import_test.cxx index d40c56c54427..8093dc5c6247 100644 --- a/lotuswordpro/qa/cppunit/import_test.cxx +++ b/lotuswordpro/qa/cppunit/import_test.cxx @@ -149,9 +149,9 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::Reference const xParagraph7(xParaEnum->nextElement(), uno::UNO_QUERY_THROW); uno::Reference xPropertySet7(xParagraph7, uno::UNO_QUERY); - sal_Int32 nParaBackColor; + Color nParaBackColor; xPropertySet7->getPropertyValue("ParaBackColor") >>= nParaBackColor; - CPPUNIT_ASSERT_EQUAL(sal_Int32(16711680), nParaBackColor); + CPPUNIT_ASSERT_EQUAL(Color(0xff0000), nParaBackColor); table::BorderLine2 aTopBorder; xPropertySet7->getPropertyValue("TopBorder") >>= aTopBorder; @@ -223,9 +223,9 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::Reference const xParagraph13(xParaEnum->nextElement(), uno::UNO_QUERY_THROW); uno::Reference xPropertySet13(xParagraph13, uno::UNO_QUERY); - sal_Int32 nCharColor; + Color nCharColor; xPropertySet13->getPropertyValue("CharColor") >>= nCharColor; - CPPUNIT_ASSERT_EQUAL(sal_Int32(65280), nCharColor); + CPPUNIT_ASSERT_EQUAL(Color(0x00ff00), nCharColor); } CPPUNIT_PLUGIN_IMPLEMENT();