diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-29 15:08:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-29 15:24:14 +0100 |
commit | 2f200f1e760477300ea0a6eb75cf0bf6841cf81f (patch) | |
tree | 0347a77f6928983c3887dec99aa5f5dfdfec1719 /svx | |
parent | 4b1e2d09ffbab74c559340f947d6b80d63a2ace0 (diff) |
Resolves: tdf#106079 automatic color described as 'white'
move RID_SVXSTR_AUTOMATIC from svx to editeng for this
Change-Id: Icc3fbb15e627ed54770d11bce7aadf30a0d12aa7
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.src | 5 |
2 files changed, 2 insertions, 7 deletions
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"; |