include/svx/dialogs.hrc | 1 -
svx/source/tbxctrls/tbcontrl.cxx | 5 +----
svx/source/tbxctrls/tbcontrl.src | 5 -----
3 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit c81142b277546714c0dfa8f9c2961c8ef80bc6d2
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Wed Nov 4 22:38:07 2015 +0200
tdf#86595 One "Text Background Color" missed
Change-Id: Ia640b9bc044a8445751f0ebad7f027466c352d1f
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index ecb9191..afa3889 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -233,7 +233,6 @@
// Strings of the ToolBox-Controls from tbcontrl.cxx
#define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191)
#define RID_SVXSTR_FRAME (RID_SVX_START + 192)
-#define RID_SVXSTR_CHAR_BACK_COLOR (RID_SVX_START + 193)
#define RID_SVXSTR_FRAME_COLOR (RID_SVX_START + 194)
#define RID_SVXSTR_FRAME_STYLE (RID_SVX_START + 195)
#define RID_SVXSTR_EXTRAS_CHARBACKGROUND (RID_SVX_START + 196)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 0d0ea9d..7bcd976 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2633,6 +2633,7 @@ VclPtr<SfxPopupWindow>
SvxColorToolBoxControl::CreatePopupWindow()
switch( GetSlotId() )
{
case SID_ATTR_CHAR_COLOR_BACKGROUND :
+ case SID_ATTR_CHAR_BACK_COLOR :
pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_EXTRAS_CHARBACKGROUND )
);
break;
@@ -2640,10 +2641,6 @@ VclPtr<SfxPopupWindow>
SvxColorToolBoxControl::CreatePopupWindow()
pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) );
break;
- case SID_ATTR_CHAR_BACK_COLOR :
- pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_CHAR_BACK_COLOR ) );
- break;
-
case SID_FRAME_LINECOLOR:
pColorWin->SetText( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) );
break;
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 456496c..c0a5bd4 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -125,11 +125,6 @@ String RID_SVXSTR_EXTRAS_CHARBACKGROUND
Text [ en-US ] = "Highlight Color" ;
};
-String RID_SVXSTR_CHAR_BACK_COLOR
-{
- Text [ en-US ] = "Text Background Color" ;
-};
-
String RID_SVXSTR_BACKGROUND
{
Text [ en-US ] = "Background";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
