diff options
| author | Yousuf Philips <philipz85@hotmail.com> | 2017-11-16 21:33:10 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2017-12-03 20:32:00 +0100 |
| commit | 6a0e03bc6c1d6e9f3b66459d82274ecad7f16f58 (patch) | |
| tree | d2698fdf0b96157d89b14f7d8b07ec4f230c0237 /svx | |
| parent | 6fefdbf721a77612ba7bb7daa384e700ba7705d3 (diff) | |
Revert "tdf#105000, related tdf#87538: Make new color names translatable"
No need for this if we will be removing tango and we shouldnt have translators waste time translating it if so.
https://bugs.documentfoundation.org/show_bug.cgi?id=113858
This reverts commit 6999bafb8675461a7f1400880eabd2daffe96ba4.
Change-Id: I7b6fe1fc84530bdbc002fcb2857942ddf268c88e
Reviewed-on: https://gerrit.libreoffice.org/44837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
(cherry picked from commit 83638a195dfde7255115cac84b2e9bb7e8e1b440)
Reviewed-on: https://gerrit.libreoffice.org/45708
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/strings.hxx | 23 | ||||
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 44 |
2 files changed, 0 insertions, 67 deletions
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index 5663812d2f92..20a2fb6046d0 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -77,29 +77,6 @@ #define RID_SVXSTR_COLOR_DARKTEAL_DEF "Dark Teal" #define RID_SVXSTR_COLOR_DARKGREEN_DEF "Dark Green" #define RID_SVXSTR_COLOR_DARKLIME_DEF "Dark Lime" -// Reference strings for the Tango color palette -#define RID_SVXSTR_COLOR_BUTTERL_DEF "Butter Light" -#define RID_SVXSTR_COLOR_BUTTERM_DEF "Butter Medium" -#define RID_SVXSTR_COLOR_BUTTERD_DEF "Butter Dark" -#define RID_SVXSTR_COLOR_ORANGEL_DEF "Orange Light" -#define RID_SVXSTR_COLOR_ORANGEM_DEF "Orange Medium" -#define RID_SVXSTR_COLOR_ORANGED_DEF "Orange Dark" -#define RID_SVXSTR_COLOR_CHOCOLATEL_DEF "Chocolate Light" -#define RID_SVXSTR_COLOR_CHOCOLATEM_DEF "Chocolate Medium" -#define RID_SVXSTR_COLOR_CHOCOLATED_DEF "Chocolate Dark" -#define RID_SVXSTR_COLOR_CHAMELEONL_DEF "Chameleon Light" -#define RID_SVXSTR_COLOR_CHAMELEONM_DEF "Chameleon Medium" -#define RID_SVXSTR_COLOR_CHAMELEOND_DEF "Chameleon Dark" -#define RID_SVXSTR_COLOR_SKYBLUEL_DEF "Sky Blue Light" -#define RID_SVXSTR_COLOR_SKYBLUEM_DEF "Sky Blue Medium" -#define RID_SVXSTR_COLOR_SKYBLUED_DEF "Sky Blue Dark" -#define RID_SVXSTR_COLOR_PLUML_DEF "Plum Light" -#define RID_SVXSTR_COLOR_PLUMM_DEF "Plum Medium" -#define RID_SVXSTR_COLOR_PLUMD_DEF "Plum Dark" -#define RID_SVXSTR_COLOR_SCARLETREDL_DEF "Scarlet Red Light" -#define RID_SVXSTR_COLOR_SCARLETREDM_DEF "Scarlet Red Medium" -#define RID_SVXSTR_COLOR_SCARLETREDD_DEF "Scarlet Red Dark" -#define RID_SVXSTR_COLOR_ALUMINIUM_DEF "Aluminium" // Reference-strings for standard-gradient-table #define RID_SVXSTR_GRDT0_DEF "Gradient" diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 797870a01a5c..06464d132a88 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1661,28 +1661,6 @@ static const char* SvxUnoColorNameDefResId[] = RID_SVXSTR_COLOR_DARKTEAL_DEF, RID_SVXSTR_COLOR_DARKGREEN_DEF, RID_SVXSTR_COLOR_DARKLIME_DEF, - RID_SVXSTR_COLOR_BUTTERL_DEF, - RID_SVXSTR_COLOR_BUTTERM_DEF, - RID_SVXSTR_COLOR_BUTTERD_DEF, - RID_SVXSTR_COLOR_ORANGEL_DEF, - RID_SVXSTR_COLOR_ORANGEM_DEF, - RID_SVXSTR_COLOR_ORANGED_DEF, - RID_SVXSTR_COLOR_CHOCOLATEL_DEF, - RID_SVXSTR_COLOR_CHOCOLATEM_DEF, - RID_SVXSTR_COLOR_CHOCOLATED_DEF, - RID_SVXSTR_COLOR_CHAMELEONL_DEF, - RID_SVXSTR_COLOR_CHAMELEONM_DEF, - RID_SVXSTR_COLOR_CHAMELEOND_DEF, - RID_SVXSTR_COLOR_SKYBLUEL_DEF, - RID_SVXSTR_COLOR_SKYBLUEM_DEF, - RID_SVXSTR_COLOR_SKYBLUED_DEF, - RID_SVXSTR_COLOR_PLUML_DEF, - RID_SVXSTR_COLOR_PLUMM_DEF, - RID_SVXSTR_COLOR_PLUMD_DEF, - RID_SVXSTR_COLOR_SCARLETREDL_DEF, - RID_SVXSTR_COLOR_SCARLETREDM_DEF, - RID_SVXSTR_COLOR_SCARLETREDD_DEF, - RID_SVXSTR_COLOR_ALUMINIUM_DEF, RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF, RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF, RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF, @@ -1758,28 +1736,6 @@ static const char* SvxUnoColorNameResId[] = RID_SVXSTR_COLOR_DARKTEAL, RID_SVXSTR_COLOR_DARKGREEN, RID_SVXSTR_COLOR_DARKLIME, - RID_SVXSTR_COLOR_BUTTERL, - RID_SVXSTR_COLOR_BUTTERM, - RID_SVXSTR_COLOR_BUTTERD, - RID_SVXSTR_COLOR_ORANGEL, - RID_SVXSTR_COLOR_ORANGEM, - RID_SVXSTR_COLOR_ORANGED, - RID_SVXSTR_COLOR_CHOCOLATEL, - RID_SVXSTR_COLOR_CHOCOLATEM, - RID_SVXSTR_COLOR_CHOCOLATED, - RID_SVXSTR_COLOR_CHAMELEONL, - RID_SVXSTR_COLOR_CHAMELEONM, - RID_SVXSTR_COLOR_CHAMELEOND, - RID_SVXSTR_COLOR_SKYBLUEL, - RID_SVXSTR_COLOR_SKYBLUEM, - RID_SVXSTR_COLOR_SKYBLUED, - RID_SVXSTR_COLOR_PLUML, - RID_SVXSTR_COLOR_PLUMM, - RID_SVXSTR_COLOR_PLUMD, - RID_SVXSTR_COLOR_SCARLETREDL, - RID_SVXSTR_COLOR_SCARLETREDM, - RID_SVXSTR_COLOR_SCARLETREDD, - RID_SVXSTR_COLOR_ALUMINIUM, RID_SVXSTR_COLOR_LIBRE_GREEN_1, RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT, RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT, |