diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-11 10:30:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-11 18:10:16 +0100 |
| commit | e58503b743d6dd5e100bfc1abb6a96f28d17d318 (patch) | |
| tree | 68e5ed29b3092c901dadcaad7d2ead44b5d65799 /include/vcl | |
| parent | 2ac1298b5f46a7dad44dbd57569b22d15d11f1e7 (diff) | |
Replace macro with function
...and move it into the only .cxx that uses it; making just enough of
BitmapColor constexpr as is useful here
Change-Id: I8a035f67f4b218dcef2f100814c62b25fb32d5be
Reviewed-on: https://gerrit.libreoffice.org/47750
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/salbtype.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index e9a3bdf599b7..0f4e45733d0f 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -98,7 +98,7 @@ private: public: inline BitmapColor(); - inline BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ); + constexpr BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ); inline BitmapColor( const Color& rColor ); explicit inline BitmapColor( sal_uInt8 cIndex ); @@ -356,7 +356,7 @@ inline BitmapColor::BitmapColor() : { } -inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ) : +constexpr BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ) : mcBlueOrIndex ( cBlue ), mcGreen ( cGreen ), mcRed ( cRed ), |