diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-06-04 01:12:56 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2018-06-04 13:31:40 +0200 |
| commit | 20e211bc420d8f8afd02d6ef6fdbafeb2d5420b3 (patch) | |
| tree | 72a6a4e2bcb3b310abfcd0f938f9e246dc67e088 /svx/source | |
| parent | b57819201ff89bbde14b4df8c02a0eb4bea2c2bb (diff) | |
tdf#117969: Translate Light/Dark Magenta
Also remove Light/Dark Violet variants
Place Magenta into the Standard colors list
and Violet into the Tonal colors list
Change-Id: Id27bb5fe62b7c69af39158680ae07d4f1f2efc95
Reviewed-on: https://gerrit.libreoffice.org/55257
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
(cherry picked from commit 56674b45cccd2702fe2bf40398c0bd00741040e1)
Reviewed-on: https://gerrit.libreoffice.org/55266
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 8bbeceaaa980..84c72e467373 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1605,12 +1605,12 @@ static const char* SvxUnoColorNameDefResId[] = RID_SVXSTR_COLOR_BLUE_DEF, RID_SVXSTR_COLOR_GREEN_DEF, RID_SVXSTR_COLOR_RED_DEF, + RID_SVXSTR_COLOR_MAGENTA_DEF, RID_SVXSTR_COLOR_GREY_DEF, RID_SVXSTR_COLOR_YELLOWGREEN_DEF, RID_SVXSTR_COLOR_YELLOW_DEF, RID_SVXSTR_COLOR_WHITE_DEF, RID_SVXSTR_COLOR_ORANGE_DEF, - RID_SVXSTR_COLOR_VIOLET_DEF, RID_SVXSTR_COLOR_BORDEAUX_DEF, RID_SVXSTR_COLOR_PALE_YELLOW_DEF, RID_SVXSTR_COLOR_PALE_GREEN_DEF, @@ -1633,7 +1633,7 @@ static const char* SvxUnoColorNameDefResId[] = RID_SVXSTR_COLOR_LIGHTORANGE_DEF, RID_SVXSTR_COLOR_LIGHTBRICK_DEF, RID_SVXSTR_COLOR_LIGHTRED_DEF, - RID_SVXSTR_COLOR_LIGHTVIOLET_DEF, + RID_SVXSTR_COLOR_LIGHTMAGENTA_DEF, RID_SVXSTR_COLOR_LIGHTPURPLE_DEF, RID_SVXSTR_COLOR_LIGHTINDIGO_DEF, RID_SVXSTR_COLOR_LIGHTBLUE_DEF, @@ -1646,13 +1646,14 @@ static const char* SvxUnoColorNameDefResId[] = RID_SVXSTR_COLOR_DARKORANGE_DEF, RID_SVXSTR_COLOR_DARKBRICK_DEF, RID_SVXSTR_COLOR_DARKRED_DEF, - RID_SVXSTR_COLOR_DARKVIOLET1_DEF, + RID_SVXSTR_COLOR_DARKMAGENTA_DEF, RID_SVXSTR_COLOR_DARKPURPLE_DEF, RID_SVXSTR_COLOR_DARKINDIGO_DEF, RID_SVXSTR_COLOR_DARKBLUE_DEF, RID_SVXSTR_COLOR_DARKTEAL_DEF, RID_SVXSTR_COLOR_DARKGREEN_DEF, RID_SVXSTR_COLOR_DARKLIME_DEF, + RID_SVXSTR_COLOR_VIOLET_DEF, RID_SVXSTR_COLOR_VIOLET_OUG_DEF, RID_SVXSTR_COLOR_BLUE_OUG_DEF, RID_SVXSTR_COLOR_AZURE_OUG_DEF, @@ -1662,7 +1663,6 @@ static const char* SvxUnoColorNameDefResId[] = RID_SVXSTR_COLOR_ORANGE_OUG_DEF, RID_SVXSTR_COLOR_RED_OUG_DEF, RID_SVXSTR_COLOR_ROSE_OUG_DEF, - RID_SVXSTR_COLOR_MAGENTA_DEF, RID_SVXSTR_COLOR_AZURE_DEF, RID_SVXSTR_COLOR_CYAN_DEF, RID_SVXSTR_COLOR_SPRINGGREEN_DEF, @@ -1693,12 +1693,12 @@ static const char* SvxUnoColorNameResId[] = RID_SVXSTR_COLOR_BLUE, RID_SVXSTR_COLOR_GREEN, RID_SVXSTR_COLOR_RED, + RID_SVXSTR_COLOR_MAGENTA, RID_SVXSTR_COLOR_GREY, RID_SVXSTR_COLOR_YELLOWGREEN, RID_SVXSTR_COLOR_YELLOW, RID_SVXSTR_COLOR_WHITE, RID_SVXSTR_COLOR_ORANGE, - RID_SVXSTR_COLOR_VIOLET, RID_SVXSTR_COLOR_BORDEAUX, RID_SVXSTR_COLOR_PALE_YELLOW, RID_SVXSTR_COLOR_PALE_GREEN, @@ -1721,7 +1721,7 @@ static const char* SvxUnoColorNameResId[] = RID_SVXSTR_COLOR_LIGHTORANGE, RID_SVXSTR_COLOR_LIGHTBRICK, RID_SVXSTR_COLOR_LIGHTRED, - RID_SVXSTR_COLOR_LIGHTVIOLET, + RID_SVXSTR_COLOR_LIGHTMAGENTA, RID_SVXSTR_COLOR_LIGHTPURPLE, RID_SVXSTR_COLOR_LIGHTINDIGO, RID_SVXSTR_COLOR_LIGHTBLUE, @@ -1734,13 +1734,14 @@ static const char* SvxUnoColorNameResId[] = RID_SVXSTR_COLOR_DARKORANGE, RID_SVXSTR_COLOR_DARKBRICK, RID_SVXSTR_COLOR_DARKRED, - RID_SVXSTR_COLOR_DARKVIOLET1, + RID_SVXSTR_COLOR_DARKMAGENTA, RID_SVXSTR_COLOR_DARKPURPLE, RID_SVXSTR_COLOR_DARKINDIGO, RID_SVXSTR_COLOR_DARKBLUE, RID_SVXSTR_COLOR_DARKTEAL, RID_SVXSTR_COLOR_DARKGREEN, RID_SVXSTR_COLOR_DARKLIME, + RID_SVXSTR_COLOR_VIOLET, RID_SVXSTR_COLOR_VIOLET_OUG, RID_SVXSTR_COLOR_BLUE_OUG, RID_SVXSTR_COLOR_AZURE_OUG, @@ -1750,7 +1751,6 @@ static const char* SvxUnoColorNameResId[] = RID_SVXSTR_COLOR_ORANGE_OUG, RID_SVXSTR_COLOR_RED_OUG, RID_SVXSTR_COLOR_ROSE_OUG, - RID_SVXSTR_COLOR_MAGENTA, RID_SVXSTR_COLOR_AZURE, RID_SVXSTR_COLOR_CYAN, RID_SVXSTR_COLOR_SPRINGGREEN, |