From 9d93fe6ca8a50e8cfbcec40507ee90f1f26bd7ba Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Wed, 19 Oct 2016 22:40:04 +0300 Subject: Remove RID_SVXITEMS_EXTRAS_CHARCOLOR string It's the same as RID_SVXSTR_TEXTCOLOR. Change-Id: I91c4ad0840ec60acbbdd9bbdc70184417cecd82f --- include/svx/svxitems.hrc | 3 --- svx/source/items/svxitems.src | 4 ---- svx/source/tbxctrls/tbcontrl.cxx | 2 +- 3 files changed, 1 insertion(+), 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 -// 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 SvxColorToolBoxControl::CreatePopupWindow() m_aBorderColorStatus, GetSlotId(), m_xFrame, - SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ), + SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ), &GetToolBox(), m_aColorSelectFunction); -- cgit