commit 9d93fe6ca8a50e8cfbcec40507ee90f1f26bd7ba
author Maxim Monastirsky <momonasmon@gmail.com> Wed Oct 19 22:40:04 2016 +0300
committer Maxim Monastirsky <momonasmon@gmail.com> Wed Oct 19 23:58:43 2016 +0300
tree 5af3190840e1fbda77e2a79c29c006324750f066
parent 978d4c11979eca54d84463b58394b421de2d4da6

Remove RID_SVXITEMS_EXTRAS_CHARCOLOR string

It's the same as RID_SVXSTR_TEXTCOLOR.

Change-Id: I91c4ad0840ec60acbbdd9bbdc70184417cecd82f

include/svx/svxitems.hrc

diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc
index dfd2e57..62e718b 100644
--- a/include/svx/svxitems.hrc
+++ b/include/svx/svxitems.hrc
@@ -22,9 +22,6 @@

#include <svl/solar.hrc>

// Extras -------------------------------------------------------------------
#define RID_SVXITEMS_EXTRAS_CHARCOLOR       (RID_SVXITEMS_START +  2)

// SvxSearchItem ------------------------------------------------------------
// Kommando
#define RID_SVXITEMS_SEARCHCMD_FIND         (RID_SVXITEMS_START + 10)

svx/source/items/svxitems.src

diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index 6687cfd..14980b6 100644
--- a/svx/source/items/svxitems.src
+++ b/svx/source/items/svxitems.src
@@ -87,10 +87,6 @@ StringArray RID_ATTR_NAMES
    };
};

String RID_SVXITEMS_EXTRAS_CHARCOLOR
{
    Text [ en-US ] = "Font color" ;
};
 // SvxSearchItem ------------------------------------------------------------
 // Kommando
String RID_SVXITEMS_SEARCHCMD_FIND

svx/source/tbxctrls/tbcontrl.cxx

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index a081a58..89da4fb 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2699,7 +2699,7 @@ VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow()
                            m_aBorderColorStatus,
                            GetSlotId(),
                            m_xFrame,
                            SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ),
                            SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ),
                            &GetToolBox(),
                            m_aColorSelectFunction);