diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/strings.hxx | 8 | ||||
| -rw-r--r-- | svx/source/styles/ColorSets.cxx | 16 | ||||
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 20 |
3 files changed, 2 insertions, 42 deletions
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index 7c7e5a40ae4c..c37c9a110659 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -375,14 +375,6 @@ #define RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF "Purple" #define RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF "Purple Accent" #define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF "Yellow Accent" -#define RID_SVXSTR_COLOR_TANGO_BUTTER_DEF "Tango: Butter" -#define RID_SVXSTR_COLOR_TANGO_ORANGE_DEF "Tango: Orange" -#define RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF "Tango: Chocolate" -#define RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF "Tango: Chameleon" -#define RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF "Tango: Sky Blue" -#define RID_SVXSTR_COLOR_TANGO_PLUM_DEF "Tango: Plum" -#define RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF "Tango: Scarlet Red" -#define RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF "Tango: Aluminium" #endif diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx index 66eead82d9a3..2e7771caefac 100644 --- a/svx/source/styles/ColorSets.cxx +++ b/svx/source/styles/ColorSets.cxx @@ -43,22 +43,6 @@ void ColorSets::init() maColorSets.push_back(aColorSet); } { - ColorSet aColorSet("Tango"); - aColorSet.add(0, 0x000000); - aColorSet.add(1, 0xFFFFFF); - aColorSet.add(2, 0x2E3436); - aColorSet.add(3, 0xBABDB6); - aColorSet.add(4, 0x3465A4); - aColorSet.add(5, 0x73D216); - aColorSet.add(6, 0xF57900); - aColorSet.add(7, 0x888A85); - aColorSet.add(8, 0xEDD400); - aColorSet.add(9, 0xEF2929); - aColorSet.add(10, 0x75507B); - aColorSet.add(11, 0x555753); - maColorSets.push_back(aColorSet); - } - { ColorSet aColorSet("Material Blue"); aColorSet.add(0, 0x212121); aColorSet.add(1, 0xFFFFFF); diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 3630ec2d65b2..92399dee20c3 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1776,15 +1776,7 @@ static const char* SvxUnoColorNameDefResId[] = RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT_DEF, RID_SVXSTR_COLOR_LIBRE_PURPLE_DEF, RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT_DEF, - RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF, - RID_SVXSTR_COLOR_TANGO_BUTTER_DEF, - RID_SVXSTR_COLOR_TANGO_ORANGE_DEF, - RID_SVXSTR_COLOR_TANGO_CHOCOLATE_DEF, - RID_SVXSTR_COLOR_TANGO_CHAMELEON_DEF, - RID_SVXSTR_COLOR_TANGO_SKY_BLUE_DEF, - RID_SVXSTR_COLOR_TANGO_PLUM_DEF, - RID_SVXSTR_COLOR_TANGO_SCARLET_RED_DEF, - RID_SVXSTR_COLOR_TANGO_ALUMINIUM_DEF + RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT_DEF }; static const char* SvxUnoColorNameResId[] = @@ -1888,15 +1880,7 @@ static const char* SvxUnoColorNameResId[] = RID_SVXSTR_COLOR_LIBRE_ORANGE_ACCENT, RID_SVXSTR_COLOR_LIBRE_PURPLE, RID_SVXSTR_COLOR_LIBRE_PURPLE_ACCENT, - RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT, - RID_SVXSTR_COLOR_TANGO_BUTTER, - RID_SVXSTR_COLOR_TANGO_ORANGE, - RID_SVXSTR_COLOR_TANGO_CHOCOLATE, - RID_SVXSTR_COLOR_TANGO_CHAMELEON, - RID_SVXSTR_COLOR_TANGO_SKY_BLUE, - RID_SVXSTR_COLOR_TANGO_PLUM, - RID_SVXSTR_COLOR_TANGO_SCARLET_RED, - RID_SVXSTR_COLOR_TANGO_ALUMINIUM + RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT }; /// @throws std::exception |