summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-03-29 15:08:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-03-29 15:24:14 +0100
commit2f200f1e760477300ea0a6eb75cf0bf6841cf81f (patch)
tree0347a77f6928983c3887dec99aa5f5dfdfec1719
parent4b1e2d09ffbab74c559340f947d6b80d63a2ace0 (diff)
Resolves: tdf#106079 automatic color described as 'white'
move RID_SVXSTR_AUTOMATIC from svx to editeng for this Change-Id: Icc3fbb15e627ed54770d11bce7aadf30a0d12aa7
-rw-r--r--editeng/source/editeng/editeng.src5
-rw-r--r--editeng/source/items/itemtype.cxx3
-rw-r--r--include/editeng/editrids.hrc2
-rw-r--r--include/svx/dialogs.hrc1
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx4
-rw-r--r--svx/source/tbxctrls/tbcontrl.src5
6 files changed, 11 insertions, 9 deletions
diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src
index 7d49a54f8fb8..bcf45d9b8abc 100644
--- a/editeng/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
@@ -75,4 +75,9 @@ String RID_STR_PARAGRAPH
Text [ en-US ] = "Paragraph is %x";
};
+String RID_SVXSTR_AUTOMATIC
+{
+ Text [ en-US ] = "Automatic";
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 70036f7c2d34..5673c59cd76f 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -134,6 +134,9 @@ OUString GetSvxString( sal_uInt16 nId )
OUString GetColorString( const Color& rCol )
{
+ if (rCol.GetColor() == COL_AUTO)
+ return EditResId::GetString(RID_SVXSTR_AUTOMATIC);
+
OUString sStr;
ColorData nColData =
diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc
index d7ed26fa4c91..d302d1ad3415 100644
--- a/include/editeng/editrids.hrc
+++ b/include/editeng/editrids.hrc
@@ -338,7 +338,7 @@
#define RID_EDITUNDO_RESETATTRIBS (RID_EDIT_START + 308)
#define RID_EDITUNDO_INDENT (RID_EDIT_START + 309)
#define RID_EDITUNDO_TRANSLITERATE (RID_EDIT_START + 310)
-//free
+#define RID_SVXSTR_AUTOMATIC (RID_EDIT_START + 311)
#define RID_STR_PARAGRAPH (RID_EDIT_START + 312)
#define RID_STR_WORD (RID_EDIT_START + 313)
#define RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION (RID_EDIT_START + 314)
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 214e0d48d7e1..481fe81ef813 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -32,7 +32,6 @@
#define RID_SVXERRCTX (RID_SVX_START + 351)
#define RID_SVXSTR_COLOR (RID_SVX_START + 179)
#define RID_SVXSTR_NOFILL (RID_SVX_START + 190)
-#define RID_SVXSTR_AUTOMATIC (RID_SVX_START + 841)
#define RID_SVXSTR_BY_AUTHOR (RID_SVX_START + 842)
#define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 843)
#define RID_SVXSTR_INVISIBLE (RID_SVX_START + 178)
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 010c044e1324..ede046e23de0 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1301,7 +1301,7 @@ SvxColorWindow::SvxColorWindow(const OUString& rCommand,
case SID_ATTR_CHAR_COLOR2:
case SID_EXTRUSION_3D_COLOR:
{
- mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) );
+ mpButtonAutoColor->SetText(EditResId::GetString(RID_SVXSTR_AUTOMATIC));
break;
}
default:
@@ -1475,7 +1475,7 @@ namespace
case SID_EXTRUSION_3D_COLOR:
default:
aColor = COL_AUTO;
- sColorName = SVX_RESSTR(RID_SVXSTR_AUTOMATIC);
+ sColorName = EditResId::GetString(RID_SVXSTR_AUTOMATIC);
break;
}
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 4372e1253736..5d3fe57b4285 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -148,11 +148,6 @@ Menu RID_SVX_PRESET_MENU
};
};
-String RID_SVXSTR_AUTOMATIC
-{
- Text [ en-US ] = "Automatic";
-};
-
String RID_SVXSTR_BY_AUTHOR
{
Text [ en-US ] = "By author";