[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - include/tools svx/source

[Yousuf Philips]

 include/tools/colordata.hxx            |    2 ++
 svx/source/tbxctrls/tbxcolorupdate.cxx |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7a32cd3c13d822171a65c955ccbbe6176d76940e
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Tue May 23 03:22:28 2017 +0400

    tdf#107731 New default red and yellow for font and highlight color
    
    Change-Id: Ide81a7a3fce963a13b5c65861f566878ccb15676
    Reviewed-on: https://gerrit.libreoffice.org/37884
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    (cherry picked from commit 318ba58031f656beda5a735d687a0ba991d9d779)
    Reviewed-on: https://gerrit.libreoffice.org/37972

diff --git a/include/tools/colordata.hxx b/include/tools/colordata.hxx
index c303957411df..3df26b57092b 100644
--- a/include/tools/colordata.hxx
+++ b/include/tools/colordata.hxx
@@ -46,6 +46,7 @@ constexpr ColorData RGB_COLORDATA(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b) {
 #define COL_GREEN                   RGB_COLORDATA( 0x00, 0x80, 0x00 )
 #define COL_CYAN                    RGB_COLORDATA( 0x00, 0x80, 0x80 )
 #define COL_RED                     RGB_COLORDATA( 0x80, 0x00, 0x00 )
+#define COL_RED_FONTCOLOR           RGB_COLORDATA( 0xCE, 0x18, 0x1E )
 #define COL_MAGENTA                 RGB_COLORDATA( 0x80, 0x00, 0x80 )
 #define COL_BROWN                   RGB_COLORDATA( 0x80, 0x80, 0x00 )
 #define COL_GRAY                    RGB_COLORDATA( 0x80, 0x80, 0x80 )
@@ -59,6 +60,7 @@ constexpr ColorData RGB_COLORDATA(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b) {
 #define COL_LIGHTMAGENTA            RGB_COLORDATA( 0xFF, 0x00, 0xFF )
 #define COL_LIGHTGRAYBLUE           RGB_COLORDATA( 0xE0, 0xE0, 0xFF )
 #define COL_YELLOW                  RGB_COLORDATA( 0xFF, 0xFF, 0x00 )
+#define COL_YELLOW_HIGHLIGHT        RGB_COLORDATA( 0xFF, 0xF2, 0x00 )
 #define COL_WHITE                   RGB_COLORDATA( 0xFF, 0xFF, 0xFF )
 #define COL_TRANSPARENT             TRGB_COLORDATA( 0xFF, 0xFF, 0xFF, 0xFF )
 #define COL_AUTO                    (ColorData)0xFFFFFFFF
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 157b65db6318..56cff24bc5df 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -42,7 +42,7 @@ namespace svx
         {
             case SID_ATTR_CHAR_COLOR:
             case SID_ATTR_CHAR_COLOR2:
-                Update(COL_RED);
+                Update(COL_RED_FONTCOLOR);
                 break;
             case SID_FRAME_LINECOLOR:
                 Update(COL_BLUE);
@@ -50,7 +50,7 @@ namespace svx
             case SID_ATTR_CHAR_COLOR_BACKGROUND:
             case SID_ATTR_CHAR_BACK_COLOR:
             case SID_BACKGROUND_COLOR:
-                Update(COL_YELLOW);
+                Update(COL_YELLOW_HIGHLIGHT);
                 break;
             case SID_ATTR_LINE_COLOR:
                 Update(COL_DEFAULT_SHAPE_STROKE);