diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-22 12:05:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-22 13:55:22 +0200 |
| commit | 7539c77fd49889015ad3a952009e33fac5324df6 (patch) | |
| tree | cbd8ef4889bd894728ab717da68e1e81f6a0e1ba /svx | |
| parent | 24b577127d16810a809b19e7ec869509fae8b901 (diff) | |
Resolves: tdf#107981 SID_FM_CTL_PROPERTIES colorbox needs a 'default' entry
we don't need MakeHexStr either, the colorbox will do that on its own
Change-Id: Ifad523092c0f15cd51d0d829790c0cec1c96bb53
Reviewed-on: https://gerrit.libreoffice.org/37898
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 9 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.src | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 50af48d13d1a..b90927a7326e 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1306,6 +1306,11 @@ SvxColorWindow::SvxColorWindow(const OUString& rCommand, mpButtonAutoColor->SetText(EditResId::GetString(RID_SVXSTR_AUTOMATIC)); break; } + case SID_FM_CTL_PROPERTIES: + { + mpButtonAutoColor->SetText( SvxResId( RID_SVXSTR_DEFAULT ) ); + break; + } default: { mpButtonAutoColor->Hide(); @@ -1415,6 +1420,10 @@ namespace aColor = COL_TRANSPARENT; sColorName = SvxResId(RID_SVXSTR_TRANSPARENT); break; + case SID_FM_CTL_PROPERTIES: + aColor = COL_TRANSPARENT; + sColorName = SvxResId(RID_SVXSTR_DEFAULT); + break; case SID_ATTR_CHAR_COLOR: case SID_ATTR_CHAR_COLOR2: case SID_EXTRUSION_3D_COLOR: diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index 5b8e14e06640..61d72cc2b5a2 100644 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -30,6 +30,11 @@ String RID_SVXSTR_TRANSPARENT Text [ en-US ] = "Transparent"; }; +String RID_SVXSTR_DEFAULT +{ + Text [ en-US ] = "Default"; +}; + String RID_SVXSTR_FRAME { Text [ en-US ] = "Borders" ; |