diff options
| -rw-r--r-- | include/svx/strings.hrc | 23 | ||||
| -rw-r--r-- | svx/inc/strings.hxx | 23 | ||||
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 44 |
3 files changed, 90 insertions, 0 deletions
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index a8960d6f9f72..208ba1bc7e49 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -601,6 +601,29 @@ #define RID_SVXSTR_COLOR_DARKTEAL NC_("RID_SVXSTR_COLOR_DARKTEAL", "Dark Teal") #define RID_SVXSTR_COLOR_DARKGREEN NC_("RID_SVXSTR_COLOR_DARKGREEN", "Dark Green") #define RID_SVXSTR_COLOR_DARKLIME NC_("RID_SVXSTR_COLOR_DARKLIME", "Dark Lime") +// Elements of the Tango color palette +#define RID_SVXSTR_COLOR_BUTTERL NC_("RID_SVXSTR_COLOR_BUTTERL", "Butter Light") +#define RID_SVXSTR_COLOR_BUTTERM NC_("RID_SVXSTR_COLOR_BUTTERM", "Butter Medium") +#define RID_SVXSTR_COLOR_BUTTERD NC_("RID_SVXSTR_COLOR_BUTTERD", "Butter Dark") +#define RID_SVXSTR_COLOR_ORANGEL NC_("RID_SVXSTR_COLOR_ORANGEL", "Orange Light") +#define RID_SVXSTR_COLOR_ORANGEM NC_("RID_SVXSTR_COLOR_ORANGEM", "Orange Medium") +#define RID_SVXSTR_COLOR_ORANGED NC_("RID_SVXSTR_COLOR_ORANGED", "Orange Dark") +#define RID_SVXSTR_COLOR_CHOCOLATEL NC_("RID_SVXSTR_COLOR_CHOCOLATEL", "Chocolate Light") +#define RID_SVXSTR_COLOR_CHOCOLATEM NC_("RID_SVXSTR_COLOR_CHOCOLATEM", "Chocolate Medium") +#define RID_SVXSTR_COLOR_CHOCOLATED NC_("RID_SVXSTR_COLOR_CHOCOLATED", "Chocolate Dark") +#define RID_SVXSTR_COLOR_CHAMELEONL NC_("RID_SVXSTR_COLOR_CHAMELEONL", "Chameleon Light") +#define RID_SVXSTR_COLOR_CHAMELEONM NC_("RID_SVXSTR_COLOR_CHAMELEONM", "Chameleon Medium") +#define RID_SVXSTR_COLOR_CHAMELEOND NC_("RID_SVXSTR_COLOR_CHAMELEOND", "Chameleon Dark") +#define RID_SVXSTR_COLOR_SKYBLUEL NC_("RID_SVXSTR_COLOR_SKYBLUEL", "Sky Blue Light") +#define RID_SVXSTR_COLOR_SKYBLUEM NC_("RID_SVXSTR_COLOR_SKYBLUEM", "Sky Blue Medium") +#define RID_SVXSTR_COLOR_SKYBLUED NC_("RID_SVXSTR_COLOR_SKYBLUED", "Sky Blue Dark") +#define RID_SVXSTR_COLOR_PLUML NC_("RID_SVXSTR_COLOR_PLUML", "Plum Light") +#define RID_SVXSTR_COLOR_PLUMM NC_("RID_SVXSTR_COLOR_PLUMM", "Plum Medium") +#define RID_SVXSTR_COLOR_PLUMD NC_("RID_SVXSTR_COLOR_PLUMD", "Plum Dark") +#define RID_SVXSTR_COLOR_SCARLETREDL NC_("RID_SVXSTR_COLOR_SCARLETREDL", "Scarlet Red Light") +#define RID_SVXSTR_COLOR_SCARLETREDM NC_("RID_SVXSTR_COLOR_SCARLETREDM", "Scarlet Red Medium") +#define RID_SVXSTR_COLOR_SCARLETREDD NC_("RID_SVXSTR_COLOR_SCARLETREDD", "Scarlet Red Dark") +#define RID_SVXSTR_COLOR_ALUMINIUM NC_("RID_SVXSTR_COLOR_ALUMINIUM", "Aluminium") /* Old default color names, probably often used in saved files */ #define RID_SVXSTR_COLOR_BLUE_CLASSIC NC_("RID_SVXSTR_COLOR_BLUE_CLASSIC", "Blue classic") #define RID_SVXSTR_COLOR_CYAN NC_("RID_SVXSTR_COLOR_CYAN", "Cyan") diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index 20a2fb6046d0..5663812d2f92 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -77,6 +77,29 @@ #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 18ac4d2e1bb1..d3ec2aee9ee1 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1660,6 +1660,28 @@ 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, @@ -1735,6 +1757,28 @@ 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, |