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 /include/vcl/salbtype.hxx | |
| 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 'include/vcl/salbtype.hxx')
| -rw-r--r-- | include/vcl/salbtype.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index a13153934e73..30d59ba2c8da 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -119,7 +119,7 @@ public: inline sal_uInt8 GetIndex() const; inline void SetIndex( sal_uInt8 cIndex ); - operator Color() const; + Color GetColor() const; inline sal_uInt8 GetBlueOrIndex() const; @@ -445,10 +445,10 @@ inline void BitmapColor::SetIndex( sal_uInt8 cIndex ) mcBlueOrIndex = cIndex; } -inline BitmapColor::operator Color() const +inline Color BitmapColor::GetColor() const { assert( !mbIndex && "Pixel represents index into colortable" ); - return Color( mcRed, mcGreen, mcBlueOrIndex ); + return Color(mcRed, mcGreen, mcBlueOrIndex); } inline sal_uInt8 BitmapColor::GetBlueOrIndex() const |