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 /sd/source/ui | |
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 'sd/source/ui')
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsFramePainter.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index 05c97f6a6c51..07027c1d1e18 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -82,7 +82,8 @@ void FramePainter::AdaptColor ( Bitmap::ScopedReadAccess pReadAccess(aBitmap); if (!pReadAccess) return; - const Color aSourceColor = pReadAccess->GetColor(0,0); + const BitmapColor aBmpSourceColor = pReadAccess->GetColor(0,0); + const Color aSourceColor = aBmpSourceColor.GetColor(); pReadAccess.reset(); // Erase the center bitmap. |