diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 10:32:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 16:11:58 +0100 |
| commit | 97448039e1e63f3bd6b61ab3215ede721ca368e4 (patch) | |
| tree | e2ea6d151df11160f2922e9e6c0c8b502a98c2fe /sw/qa | |
| parent | e95618d754ee4e75632ed5f2bc29b8a021f45731 (diff) | |
use less RGB_COLORDATA
part of removing ColorData
Change-Id: If31b5b88545529863377e9a178f45f4516bf6cbb
Reviewed-on: https://gerrit.libreoffice.org/50345
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 6 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index a638dd818574..5ab5c5910ba3 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -458,7 +458,7 @@ DECLARE_ODFIMPORT_TEST(testFdo75872_ooo33, "fdo75872_ooo33.odt") uno::Reference<drawing::XShape> xShape = getShape(1); CPPUNIT_ASSERT_EQUAL(sal_Int32(COL_BLACK), getProperty<sal_Int32>(xShape, "LineColor")); - CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(153, 204, 255)), + CPPUNIT_ASSERT_EQUAL(sal_Int32(Color(153, 204, 255)), getProperty<sal_Int32>(xShape, "FillColor")); } @@ -466,9 +466,9 @@ DECLARE_ODFIMPORT_TEST(testFdo75872_aoo40, "fdo75872_aoo40.odt") { // graphics default style: line color and fill color changed uno::Reference<drawing::XShape> xShape = getShape(1); - CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(128, 128, 128)), + CPPUNIT_ASSERT_EQUAL(sal_Int32(Color(128, 128, 128)), getProperty<sal_Int32>(xShape, "LineColor")); - CPPUNIT_ASSERT_EQUAL(sal_Int32(RGB_COLORDATA(0xCF, 0xE7, 0xF5)), + CPPUNIT_ASSERT_EQUAL(sal_Int32(Color(0xCF, 0xE7, 0xF5)), getProperty<sal_Int32>(xShape, "FillColor")); } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index bacdd60ea0cb..0f1adf0c25c7 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -365,9 +365,9 @@ DECLARE_OOXMLEXPORT_TEST(testPictureWithSchemeColor, "picture-with-schemecolor.d CPPUNIT_ASSERT_EQUAL(341L, pAccess->Width()); CPPUNIT_ASSERT_EQUAL(181L, pAccess->Height()); Color aColor(pAccess->GetPixel(30, 120).GetColor()); - CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xb1, 0xc8, 0xdd )); + CPPUNIT_ASSERT_EQUAL(aColor, Color( 0xb1, 0xc8, 0xdd )); aColor = pAccess->GetPixel(130, 260).GetColor(); - CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xb1, 0xc8, 0xdd )); + CPPUNIT_ASSERT_EQUAL(aColor, Color( 0xb1, 0xc8, 0xdd )); } DECLARE_OOXMLEXPORT_TEST(testFdo69656, "Table_cell_auto_width_fdo69656.docx") @@ -543,7 +543,7 @@ DECLARE_OOXMLEXPORT_TEST(testMsoBrightnessContrast, "msobrightnesscontrast.docx" CPPUNIT_ASSERT_EQUAL(58L, pAccess->Width()); CPPUNIT_ASSERT_EQUAL(320L, pAccess->Height()); Color aColor(pAccess->GetPixel(30, 20).GetColor()); - CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xce, 0xce, 0xce )); + CPPUNIT_ASSERT_EQUAL(aColor, Color( 0xce, 0xce, 0xce )); } DECLARE_OOXMLEXPORT_TEST(testChartSize, "chart-size.docx") |