diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-01-21 04:48:50 +1100 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-06-16 15:55:34 -0400 |
| commit | da91ffc94ac6772e593e13257896fec52e311eb9 (patch) | |
| tree | 518c11ec82012ef5bbe7fc7420005d98c2c5e1eb /sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | |
| parent | dcae336143f25a2fb98d4c4adee6df4e5cef4053 (diff) | |
vcl: remove BitmapColor Color() operator
BitmapColor has a Color() operator. However, this is confusing and
tends to hide that the two classes aren't the same. I have converted this
to GetColor().
Disable some tests that are failing to build due to missing << operator.
Reviewed-on: https://gerrit.libreoffice.org/48245
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 01e470f0ab49e458c57b0f28636a517b2bfb1b4a)
Change-Id: I0be2dcb3fc420e7be9c8d04330e7a3fe69a5412a
Diffstat (limited to 'sw/qa/extras/ooxmlexport/ooxmlexport8.cxx')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx index cdf4c8e7e826..b146a13c3d78 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx @@ -1418,9 +1418,9 @@ DECLARE_OOXMLEXPORT_TEST(testPictureWithSchemeColor, "picture-with-schemecolor.d CPPUNIT_ASSERT(pAccess); CPPUNIT_ASSERT_EQUAL(341L, pAccess->Width()); CPPUNIT_ASSERT_EQUAL(181L, pAccess->Height()); - Color aColor(pAccess->GetPixel(30, 120)); + Color aColor(pAccess->GetPixel(30, 120).GetColor()); CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xb1, 0xc8, 0xdd )); - aColor = pAccess->GetPixel(130, 260); + aColor = pAccess->GetPixel(130, 260).GetColor(); CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xb1, 0xc8, 0xdd )); Bitmap::ReleaseAccess(pAccess); } @@ -1597,7 +1597,7 @@ DECLARE_OOXMLEXPORT_TEST(testMsoBrightnessContrast, "msobrightnesscontrast.docx" CPPUNIT_ASSERT(pAccess); CPPUNIT_ASSERT_EQUAL(58L, pAccess->Width()); CPPUNIT_ASSERT_EQUAL(320L, pAccess->Height()); - Color aColor(pAccess->GetPixel(30, 20)); + Color aColor(pAccess->GetPixel(30, 20).GetColor()); CPPUNIT_ASSERT_EQUAL(aColor.GetColor(), RGB_COLORDATA( 0xce, 0xce, 0xce )); Bitmap::ReleaseAccess(pAccess); } |