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 /editeng | |
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 'editeng')
-rw-r--r-- | editeng/source/editeng/editeng.src | 5 | ||||
-rw-r--r-- | editeng/source/items/itemtype.cxx | 3 |
2 files changed, 8 insertions, 0 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 = |