summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-10-19 22:40:04 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-10-19 23:58:43 +0300
commit9d93fe6ca8a50e8cfbcec40507ee90f1f26bd7ba (patch)
tree5af3190840e1fbda77e2a79c29c006324750f066
parent978d4c11979eca54d84463b58394b421de2d4da6 (diff)
Remove RID_SVXITEMS_EXTRAS_CHARCOLOR string
It's the same as RID_SVXSTR_TEXTCOLOR. Change-Id: I91c4ad0840ec60acbbdd9bbdc70184417cecd82f
-rw-r--r--include/svx/svxitems.hrc3
-rw-r--r--svx/source/items/svxitems.src4
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
3 files changed, 1 insertions, 8 deletions
diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc
index dfd2e5707d26..62e718b5d396 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)
diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src
index 6687cfd4d6a2..14980b69cf12 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
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index a081a5838ad5..89da4fb85226 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);