diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-14 11:11:02 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-26 08:44:50 +0200 |
| commit | bea081b5099786e5fcadddd72c247b9a9488286a (patch) | |
| tree | dd165f81e850cb9bcfa23b713bd60e3fb26d21ee /include | |
| parent | a488c7ad2763b944713997911c1ddb0315d8c93f (diff) | |
replace SalColor with Color
Change-Id: I615640a378a61cf6e44e84a647ce06bdd8a52807
Reviewed-on: https://gerrit.libreoffice.org/51239
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/salgtype.hxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx index 51f81d6c737b..0e37300f3dbd 100644 --- a/include/vcl/salgtype.hxx +++ b/include/vcl/salgtype.hxx @@ -22,6 +22,7 @@ #include <sal/types.h> #include <o3tl/typed_flags_set.hxx> +#include <tools/color.hxx> enum class DeviceFormat { NONE = -1, @@ -32,16 +33,7 @@ enum class DeviceFormat { #endif }; -typedef sal_uInt32 SalColor; - -constexpr SalColor MAKE_SALCOLOR(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b) { - return sal_uInt32(b) | (sal_uInt32(g) << 8) | (sal_uInt32(r) << 16); -} - -#define SALCOLOR_RED( n ) (static_cast<sal_uInt8>((n)>>16)) -#define SALCOLOR_GREEN( n ) (static_cast<sal_uInt8>((static_cast<sal_uInt16>(n)) >> 8)) -#define SALCOLOR_BLUE( n ) (static_cast<sal_uInt8>(n)) -#define SALCOLOR_NONE (~SalColor(0)) +constexpr ::Color SALCOLOR_NONE ( 0xFF, 0xFF, 0xFF, 0xFF ); // must equal to class Point struct SalPoint |