diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2018-01-21 04:48:50 +1100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-02-05 09:00:54 +0100 |
| commit | 01e470f0ab49e458c57b0f28636a517b2bfb1b4a (patch) | |
| tree | e153e55125b3d5682e60425b80568c5e03a3695a /cui | |
| parent | 79517c0471aff4abf336bd81834bd28732dad67f (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().
Change-Id: I0be2dcb3fc420e7be9c8d04330e7a3fe69a5412a
Reviewed-on: https://gerrit.libreoffice.org/48245
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/tppattern.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 687e44677825..6492ad558a3e 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -447,7 +447,7 @@ void ColorFieldControl::ShowPosition( const Point& rPos, bool bUpdate ) if (pReadAccess != nullptr) { // mpBitmap always has a bit count of 24 => use of GetPixel(...) is safe - maColor = pReadAccess->GetPixel(nY, nX); + maColor = pReadAccess->GetPixel(nY, nX).GetColor(); Bitmap::ReleaseAccess(pReadAccess); pReadAccess = nullptr; } diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 5422e9c0334f..141bd052cc66 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -313,8 +313,8 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, ValueSet*, void) m_pCtlPixel->SetXBitmap(pGraphicObject->GetGraphic().GetBitmapEx()); - Color aPixelColor = aFront; - Color aBackColor = aBack; + Color aPixelColor = aFront.GetColor(); + Color aBackColor = aBack.GetColor(); m_pLbColor->SelectEntry( aPixelColor ); m_pLbBackgroundColor->SelectEntry( aBackColor ); |