From 97448039e1e63f3bd6b61ab3215ede721ca368e4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 26 Feb 2018 10:32:20 +0200 Subject: use less RGB_COLORDATA part of removing ColorData Change-Id: If31b5b88545529863377e9a178f45f4516bf6cbb Reviewed-on: https://gerrit.libreoffice.org/50345 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- include/filter/msfilter/msdffimp.hxx | 2 +- include/tools/color.hxx | 2 +- include/vcl/settings.hxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index e79991a052d7..a33ad902408f 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -109,7 +109,7 @@ public: void ImportGradientColor( SfxItemSet& aSet, MSO_FillType eMSO_FillType, double dTrans, double dBackTrans ) const; }; -#define COL_DEFAULT RGB_COLORDATA( 0xFA, 0xFB, 0xFC ) +#define COL_DEFAULT ::Color( 0xFA, 0xFB, 0xFC ) typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer; diff --git a/include/tools/color.hxx b/include/tools/color.hxx index 823c90909310..29d202908128 100644 --- a/include/tools/color.hxx +++ b/include/tools/color.hxx @@ -133,7 +133,7 @@ public: // Hue: 0-360 degree // Saturation: 0-100% // Brightness: 0-100% - static ColorData HSBtoRGB(sal_uInt16 nHue, sal_uInt16 nSaturation, sal_uInt16 nBrightness); + static Color HSBtoRGB(sal_uInt16 nHue, sal_uInt16 nSaturation, sal_uInt16 nBrightness); void RGBtoHSB(sal_uInt16& nHue, sal_uInt16& nSaturation, sal_uInt16& nBrightness) const; bool operator==(const Color& rColor) const diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 6b061336f61d..b8cc012414ce 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -570,7 +570,7 @@ public: void SetEdgeBlending(sal_uInt16 nCount); sal_uInt16 GetEdgeBlending() const; - // TopLeft (default RGB_COLORDATA(0xC0, 0xC0, 0xC0)) and BottomRight (default RGB_COLORDATA(0x40, 0x40, 0x40)) + // TopLeft (default Color(0xC0, 0xC0, 0xC0)) and BottomRight (default Color(0x40, 0x40, 0x40)) // default colors for EdgeBlending const Color& GetEdgeBlendingTopLeftColor() const; const Color& GetEdgeBlendingBottomRightColor() const; -- cgit