From c3ec2fb53c68547deda0724315841c818a39fb12 Mon Sep 17 00:00:00 2001 From: heiko tietze Date: Mon, 7 May 2018 13:07:01 +0200 Subject: tdf#114006 - New default set of gradient presets New set of gradients incl. l10n and ui test Change-Id: Iee303a39ad721b5a4e8b9adb78ee5a82227b84f4 Reviewed-on: https://gerrit.libreoffice.org/53934 Tested-by: Jenkins Reviewed-by: andreas_kainz --- svx/inc/strings.hxx | 34 ++++++++++++++++------------------ svx/source/unodraw/unoprov.cxx | 10 ++-------- 2 files changed, 18 insertions(+), 26 deletions(-) (limited to 'svx') diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index 3b309b8253f0..3bcd02597c38 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -163,24 +163,22 @@ #define RID_SVXSTR_GRDT67_DEF "Purple Pipe" #define RID_SVXSTR_GRDT68_DEF "Night" #define RID_SVXSTR_GRDT69_DEF "Green Gradient" -#define RID_SVXSTR_GRDT70_DEF "Tango Green" -#define RID_SVXSTR_GRDT71_DEF "Subtle Tango Green" -#define RID_SVXSTR_GRDT72_DEF "Tango Purple" -#define RID_SVXSTR_GRDT73_DEF "Tango Red" -#define RID_SVXSTR_GRDT74_DEF "Tango Blue" -#define RID_SVXSTR_GRDT75_DEF "Tango Yellow" -#define RID_SVXSTR_GRDT76_DEF "Tango Orange" -#define RID_SVXSTR_GRDT77_DEF "Tango Gray" -#define RID_SVXSTR_GRDT78_DEF "Clay" -#define RID_SVXSTR_GRDT79_DEF "Olive Green" -#define RID_SVXSTR_GRDT80_DEF "Silver" -#define RID_SVXSTR_GRDT81_DEF "Sunburst" -#define RID_SVXSTR_GRDT82_DEF "Brownie" -#define RID_SVXSTR_GRDT83_DEF "Sunset" -#define RID_SVXSTR_GRDT84_DEF "Deep Green" -#define RID_SVXSTR_GRDT85_DEF "Deep Orange" -#define RID_SVXSTR_GRDT86_DEF "Deep Blue" -#define RID_SVXSTR_GRDT87_DEF "Purple Haze" +//actual gradients defined for 6.1 +#define RID_SVXSTR_GRDT70_DEF "Pastel Bouqet" +#define RID_SVXSTR_GRDT71_DEF "Pastel Dream" +#define RID_SVXSTR_GRDT72_DEF "Blue Touch" +#define RID_SVXSTR_GRDT73_DEF "Blank with Gray" +#define RID_SVXSTR_GRDT74_DEF "Spotted Gray" +#define RID_SVXSTR_GRDT75_DEF "London Mist" +#define RID_SVXSTR_GRDT76_DEF "Teal to Blue" +#define RID_SVXSTR_GRDT77_DEF "Midnight" +#define RID_SVXSTR_GRDT78_DEF "Deep Ocean" +#define RID_SVXSTR_GRDT79_DEF "Submarine" +#define RID_SVXSTR_GRDT80_DEF "Green Grass" +#define RID_SVXSTR_GRDT81_DEF "Neon Light" +#define RID_SVXSTR_GRDT82_DEF "Sunshine" +#define RID_SVXSTR_GRDT83_DEF "Present" +#define RID_SVXSTR_GRDT84_DEF "Mahagoni" // Reference-strings for standard-hatch-table #define RID_SVXSTR_HATCH0_DEF "Black 45 Degrees Wide" #define RID_SVXSTR_HATCH1_DEF "Black 45 Degrees" diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 9d9b1eeffbf4..9cbb7796fdd8 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1360,10 +1360,7 @@ static const char* RID_SVXSTR_GRDT_DEF[] = RID_SVXSTR_GRDT81_DEF, RID_SVXSTR_GRDT82_DEF, RID_SVXSTR_GRDT83_DEF, - RID_SVXSTR_GRDT84_DEF, - RID_SVXSTR_GRDT85_DEF, - RID_SVXSTR_GRDT86_DEF, - RID_SVXSTR_GRDT87_DEF + RID_SVXSTR_GRDT84_DEF }; static const char* RID_SVXSTR_GRDT[] = @@ -1452,10 +1449,7 @@ static const char* RID_SVXSTR_GRDT[] = RID_SVXSTR_GRDT81, RID_SVXSTR_GRDT82, RID_SVXSTR_GRDT83, - RID_SVXSTR_GRDT84, - RID_SVXSTR_GRDT85, - RID_SVXSTR_GRDT86, - RID_SVXSTR_GRDT87 + RID_SVXSTR_GRDT84 }; static const char* RID_SVXSTR_HATCHS_DEF[] = -- cgit