diff --git a/extras/source/palettes/material.soc b/extras/source/palettes/material.soc index e06d4a7cadd5..c5f8823f2e8b 100644 --- a/extras/source/palettes/material.soc +++ b/extras/source/palettes/material.soc @@ -3,19 +3,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -255,17 +255,17 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 6690d18a2b48..3f762edf5e3b 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -619,6 +619,31 @@ #define RID_SVXSTR_COLOR_SPRINGGREEN NC_("RID_SVXSTR_COLOR_SPRINGGREEN", "Spring Green") #define RID_SVXSTR_COLOR_CHARTREUSEGREEN NC_("RID_SVXSTR_COLOR_CHARTREUSEGREEN", "Chartreuse Green") #define RID_SVXSTR_COLOR_ROSE NC_("RID_SVXSTR_COLOR_ROSE", "Rose") +//Elements of the Material color palette +#define RID_SVXSTR_COLOR_MATERIAL_GRAY_A NC_("RID_SVXSTR_COLOR_MATERIAL_GRAY_A", "Gray A") +#define RID_SVXSTR_COLOR_MATERIAL_YELLOW_A NC_("RID_SVXSTR_COLOR_MATERIAL_YELLOW_A", "Yellow A") +#define RID_SVXSTR_COLOR_MATERIAL_AMBER_A NC_("RID_SVXSTR_COLOR_MATERIAL_AMBER_A", "Amber A") +#define RID_SVXSTR_COLOR_MATERIAL_AMBER NC_("RID_SVXSTR_COLOR_MATERIAL_AMBER", "Amber") +#define RID_SVXSTR_COLOR_MATERIAL_ORANGE_A NC_("RID_SVXSTR_COLOR_MATERIAL_ORANGE_A", "Orange A") +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A", "Deep Orange A") +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE", "Deep Orange") +#define RID_SVXSTR_COLOR_MATERIAL_RED_A NC_("RID_SVXSTR_COLOR_MATERIAL_RED_A", "Red A") +#define RID_SVXSTR_COLOR_MATERIAL_PINK_A NC_("RID_SVXSTR_COLOR_MATERIAL_PINK_A", "Pink A") +#define RID_SVXSTR_COLOR_MATERIAL_PURPLE_A NC_("RID_SVXSTR_COLOR_MATERIAL_PURPLE_A", "Purple A") +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A", "Deep Purple A") +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE", "Deep Purple") +#define RID_SVXSTR_COLOR_MATERIAL_INDIGO_A NC_("RID_SVXSTR_COLOR_MATERIAL_INDIGO_A", "Indigo A") +#define RID_SVXSTR_COLOR_MATERIAL_BLUE_A NC_("RID_SVXSTR_COLOR_MATERIAL_BLUE_A", "Blue A") +#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A", "Light Blue A") +#define RID_SVXSTR_COLOR_MATERIAL_CYAN_A NC_("RID_SVXSTR_COLOR_MATERIAL_CYAN_A", "Cyan A") +#define RID_SVXSTR_COLOR_MATERIAL_TEAL_A NC_("RID_SVXSTR_COLOR_MATERIAL_TEAL_A", "Teal A") +#define RID_SVXSTR_COLOR_MATERIAL_GREEN_A NC_("RID_SVXSTR_COLOR_MATERIAL_GREEN_A", "Green A") +#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A", "Light Green A") +#define RID_SVXSTR_COLOR_MATERIAL_LIME_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIME_A", "Lime A") +#define RID_SVXSTR_COLOR_MATERIAL_BROWN_A NC_("RID_SVXSTR_COLOR_MATERIAL_BROWN_A", "Brown A") +#define RID_SVXSTR_COLOR_MATERIAL_BROWN NC_("RID_SVXSTR_COLOR_MATERIAL_BROWN", "Brown") +#define RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A NC_("RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A", "Blue Gray A") +#define RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY NC_("RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY", "Blue Gray") /* 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_BLUEGREY NC_("RID_SVXSTR_COLOR_BLUEGREY", "Blue gray") diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index 81b9901980b6..353b97c54c83 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -91,7 +91,31 @@ #define RID_SVXSTR_COLOR_SPRINGGREEN_DEF "Spring Green" #define RID_SVXSTR_COLOR_CHARTREUSEGREEN_DEF "Chartreuse Green" #define RID_SVXSTR_COLOR_ROSE_DEF "Rose" - +// Reference strings for the Material palette +#define RID_SVXSTR_COLOR_MATERIAL_GRAY_A_DEF "Gray A" +#define RID_SVXSTR_COLOR_MATERIAL_YELLOW_A_DEF "Yellow A" +#define RID_SVXSTR_COLOR_MATERIAL_AMBER_A_DEF "Amber A" +#define RID_SVXSTR_COLOR_MATERIAL_AMBER_DEF "Amber" +#define RID_SVXSTR_COLOR_MATERIAL_ORANGE_A_DEF "Orange A" +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A_DEF "Deep Orange A" +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_DEF "Deep Orange" +#define RID_SVXSTR_COLOR_MATERIAL_RED_A_DEF "Red A" +#define RID_SVXSTR_COLOR_MATERIAL_PINK_A_DEF "Pink A" +#define RID_SVXSTR_COLOR_MATERIAL_PURPLE_A_DEF "Purple A" +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A_DEF "Deep Purple A" +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_DEF "Deep Purple" +#define RID_SVXSTR_COLOR_MATERIAL_INDIGO_A_DEF "Indigo A" +#define RID_SVXSTR_COLOR_MATERIAL_BLUE_A_DEF "Blue A" +#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A_DEF "Light Blue A" +#define RID_SVXSTR_COLOR_MATERIAL_CYAN_A_DEF "Cyan A" +#define RID_SVXSTR_COLOR_MATERIAL_TEAL_A_DEF "Teal A" +#define RID_SVXSTR_COLOR_MATERIAL_GREEN_A_DEF "Green A" +#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A_DEF "Light Green A" +#define RID_SVXSTR_COLOR_MATERIAL_LIME_A_DEF "Lime A" +#define RID_SVXSTR_COLOR_MATERIAL_BROWN_A_DEF "Brown A" +#define RID_SVXSTR_COLOR_MATERIAL_BROWN_DEF "Brown" +#define RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A_DEF "Blue Gray A" +#define RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_DEF "Blue Gray" // Reference-strings for standard-gradient-table #define RID_SVXSTR_GRDT0_DEF "Gradient" #define RID_SVXSTR_GRDT1_DEF "Linear blue/white" diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 25b6486b01b1..06bd11bda42e 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1664,6 +1664,30 @@ static const char* SvxUnoColorNameDefResId[] = RID_SVXSTR_COLOR_SPRINGGREEN_DEF, RID_SVXSTR_COLOR_CHARTREUSEGREEN_DEF, RID_SVXSTR_COLOR_ROSE_DEF, + RID_SVXSTR_COLOR_MATERIAL_GRAY_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_YELLOW_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_AMBER_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_AMBER_DEF, + RID_SVXSTR_COLOR_MATERIAL_ORANGE_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_DEF, + RID_SVXSTR_COLOR_MATERIAL_RED_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_PINK_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_PURPLE_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_DEF, + RID_SVXSTR_COLOR_MATERIAL_INDIGO_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_BLUE_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_CYAN_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_TEAL_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_GREEN_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_LIME_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_BROWN_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_BROWN_DEF, + RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A_DEF, + RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_DEF, RID_SVXSTR_COLOR_LIBRE_GREEN_1_DEF, RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT_DEF, RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT_DEF, @@ -1752,6 +1776,30 @@ static const char* SvxUnoColorNameResId[] = RID_SVXSTR_COLOR_SPRINGGREEN, RID_SVXSTR_COLOR_CHARTREUSEGREEN, RID_SVXSTR_COLOR_ROSE, + RID_SVXSTR_COLOR_MATERIAL_GRAY_A, + RID_SVXSTR_COLOR_MATERIAL_YELLOW_A, + RID_SVXSTR_COLOR_MATERIAL_AMBER_A, + RID_SVXSTR_COLOR_MATERIAL_AMBER, + RID_SVXSTR_COLOR_MATERIAL_ORANGE_A, + RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A, + RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE, + RID_SVXSTR_COLOR_MATERIAL_RED_A, + RID_SVXSTR_COLOR_MATERIAL_PINK_A, + RID_SVXSTR_COLOR_MATERIAL_PURPLE_A, + RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A, + RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE, + RID_SVXSTR_COLOR_MATERIAL_INDIGO_A, + RID_SVXSTR_COLOR_MATERIAL_BLUE_A, + RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A, + RID_SVXSTR_COLOR_MATERIAL_CYAN_A, + RID_SVXSTR_COLOR_MATERIAL_TEAL_A, + RID_SVXSTR_COLOR_MATERIAL_GREEN_A, + RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A, + RID_SVXSTR_COLOR_MATERIAL_LIME_A, + RID_SVXSTR_COLOR_MATERIAL_BROWN_A, + RID_SVXSTR_COLOR_MATERIAL_BROWN, + RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY_A, + RID_SVXSTR_COLOR_MATERIAL_BLUE_GRAY, RID_SVXSTR_COLOR_LIBRE_GREEN_1, RID_SVXSTR_COLOR_LIBRE_GREEN_ACCENT, RID_SVXSTR_COLOR_LIBRE_BLUE_ACCENT,