From c410a3dcfeb68ba2247c0d879727afe4ca8ed3da Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 26 Feb 2018 10:55:42 +0200 Subject: [PATCH] use less TRGB_COLORDATA part of removing ColorData Change-Id: Id2d5843762227559f97cfb5eb61c01c888a0601e Reviewed-on: https://gerrit.libreoffice.org/50347 Tested-by: Jenkins Reviewed-by: Noel Grandin --- UnoControls/source/inc/progressbar.hxx | 9 +++++---- UnoControls/source/inc/progressmonitor.hxx | 4 ++-- UnoControls/source/inc/statusindicator.hxx | 6 +++--- cui/source/tabpages/chardlg.cxx | 2 +- include/svx/colorwindow.hxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index f3d073d8bacc..a31208ca0c5a 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -24,6 +24,7 @@ #include #include +#include #include @@ -34,14 +35,14 @@ namespace unocontrols{ #define PROGRESSBAR_FREESPACE 4 #define PROGRESSBAR_DEFAULT_HORIZONTAL true #define PROGRESSBAR_DEFAULT_BLOCKDIMENSION Size(1,1) -#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray -#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x80 ) // blue +#define PROGRESSBAR_DEFAULT_BACKGROUNDCOLOR sal_Int32(Color( 0x00, 0xC0, 0xC0, 0xC0 )) // lightgray +#define PROGRESSBAR_DEFAULT_FOREGROUNDCOLOR sal_Int32(Color( 0x00, 0x00, 0x00, 0x80 )) // blue #define PROGRESSBAR_DEFAULT_MINRANGE INT_MIN #define PROGRESSBAR_DEFAULT_MAXRANGE INT_MAX #define PROGRESSBAR_DEFAULT_BLOCKVALUE 1 #define PROGRESSBAR_DEFAULT_VALUE PROGRESSBAR_DEFAULT_MINRANGE -#define PROGRESSBAR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white -#define PROGRESSBAR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black +#define PROGRESSBAR_LINECOLOR_BRIGHT sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF )) // white +#define PROGRESSBAR_LINECOLOR_SHADOW sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 )) // black class ProgressBar : public css::awt::XControlModel , public css::awt::XProgressBar diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index 75b84e0217b4..1e6827f4c272 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -78,8 +78,8 @@ class ProgressBar; #define DEFAULT_BUTTONLABEL "Abbrechen" #define PROGRESSMONITOR_DEFAULT_TOPIC "" #define PROGRESSMONITOR_DEFAULT_TEXT "" -#define PROGRESSMONITOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white -#define PROGRESSMONITOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black +#define PROGRESSMONITOR_LINECOLOR_BRIGHT sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF )) // white +#define PROGRESSMONITOR_LINECOLOR_SHADOW sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 )) // black #define PROGRESSMONITOR_DEFAULT_WIDTH 350 #define PROGRESSMONITOR_DEFAULT_HEIGHT 100 diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx index 3b27099ec749..a18c98e6f257 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -42,9 +42,9 @@ class ProgressBar; #define FIXEDTEXT_MODELNAME "com.sun.star.awt.UnoControlFixedTextModel" #define CONTROLNAME_TEXT "Text" // identifier the control in container #define CONTROLNAME_PROGRESSBAR "ProgressBar" // -||- -#define STATUSINDICATOR_BACKGROUNDCOLOR TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 ) // lightgray -#define STATUSINDICATOR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF ) // white -#define STATUSINDICATOR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 ) // black +#define STATUSINDICATOR_BACKGROUNDCOLOR sal_Int32(Color( 0x00, 0xC0, 0xC0, 0xC0 )) // lightgray +#define STATUSINDICATOR_LINECOLOR_BRIGHT sal_Int32(Color( 0x00, 0xFF, 0xFF, 0xFF )) // white +#define STATUSINDICATOR_LINECOLOR_SHADOW sal_Int32(Color( 0x00, 0x00, 0x00, 0x00 )) // black #define STATUSINDICATOR_DEFAULT_WIDTH 300 #define STATUSINDICATOR_DEFAULT_HEIGHT 25 diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index cc34b315dd08..7f34cb2246d4 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1372,7 +1372,7 @@ Color SvxCharEffectsPage::GetPreviewFontColor(const Color& rColor) const { if (rColor.GetColor() == COL_AUTO) return Color(COL_BLACK); - if (m_bEnableNoneFontColor && rColor.GetColor() == COL_NONE_COLOR) + if (m_bEnableNoneFontColor && rColor == COL_NONE_COLOR) return Color(COL_BLACK); return rColor; } diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index 24a83c140e8a..e4a530248419 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -47,7 +47,7 @@ public: class Button; typedef std::function ColorSelectFunction; -#define COL_NONE_COLOR TRGB_COLORDATA(0x80, 0xFF, 0xFF, 0xFF) +#define COL_NONE_COLOR ::Color(0x80, 0xFF, 0xFF, 0xFF) class SVX_DLLPUBLIC SvxColorWindow : public svtools::ToolbarPopup { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d1a47efad2a8..e839dbed3d56 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1430,7 +1430,7 @@ namespace NamedColor GetNoneColor() { - return std::make_pair(Color(COL_NONE_COLOR), SvxResId(RID_SVXSTR_NONE)); + return std::make_pair(COL_NONE_COLOR, SvxResId(RID_SVXSTR_NONE)); } }