diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 10:32:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-26 16:11:58 +0100 |
| commit | 97448039e1e63f3bd6b61ab3215ede721ca368e4 (patch) | |
| tree | e2ea6d151df11160f2922e9e6c0c8b502a98c2fe /tools | |
| parent | e95618d754ee4e75632ed5f2bc29b8a021f45731 (diff) | |
use less RGB_COLORDATA
part of removing ColorData
Change-Id: If31b5b88545529863377e9a178f45f4516bf6cbb
Reviewed-on: https://gerrit.libreoffice.org/50345
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/generic/color.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/source/generic/color.cxx b/tools/source/generic/color.cxx index f11f6fd564eb..9f88f2c111b3 100644 --- a/tools/source/generic/color.cxx +++ b/tools/source/generic/color.cxx @@ -142,7 +142,7 @@ void Color::RGBtoHSB( sal_uInt16& nHue, sal_uInt16& nSat, sal_uInt16& nBri ) con } } -ColorData Color::HSBtoRGB( sal_uInt16 nHue, sal_uInt16 nSat, sal_uInt16 nBri ) +Color Color::HSBtoRGB( sal_uInt16 nHue, sal_uInt16 nSat, sal_uInt16 nBri ) { sal_uInt8 cR=0,cG=0,cB=0; sal_uInt8 nB = static_cast<sal_uInt8>( nBri * 255 / 100 ); @@ -180,7 +180,7 @@ ColorData Color::HSBtoRGB( sal_uInt16 nHue, sal_uInt16 nSat, sal_uInt16 nBri ) } } - return RGB_COLORDATA( cR, cG, cB ); + return Color( cR, cG, cB ); } SvStream& Color::Read( SvStream& rIStm ) @@ -220,7 +220,7 @@ SvStream& ReadColor( SvStream& rIStream, Color& rColor ) rIStream.ReadUInt16( nGreen ); rIStream.ReadUInt16( nBlue ); - rColor.mnColor = RGB_COLORDATA( nRed>>8, nGreen>>8, nBlue>>8 ); + rColor = Color( nRed>>8, nGreen>>8, nBlue>>8 ); } else { |