extras/source/palettes/standard.sog | 4 +++-
include/svx/strings.hrc | 22 +++++++++++-----------
svx/inc/strings.hxx | 22 +++++++++++-----------
3 files changed, 25 insertions(+), 23 deletions(-)
New commits:
commit d0a9d04d2287da456317c5a59af3ccbe3b98b977
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Fri Jun 16 09:03:11 2023 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Fri Jun 23 11:23:35 2023 +0200
MCGR: Some exemplary multi-color gradients
* "Rainbow, Sunrise, Sunset" added
* "Preset, Spotted Grey, Teal To Blue" removed
to keep items inside scrolled window
Change-Id: I3be6c8596accc769df92a8610260ed38a6c29602
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153166
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/extras/source/palettes/standard.sog
b/extras/source/palettes/standard.sog
index 036faa856de4..32f9d37e9411 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +1,3 @@
-<!-- <?xml version="1.0" encoding="UTF-8"?> --><ooo:gradient-table
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:svg="http://www.w3.org/2000/svg";
xmlns:ooo="http://openoffice.org/2004/office";><draw:gradient
draw:name="Pastel_20_Bouquet" draw:display-name="Pastel Bouquet"
draw:style="linear" draw:start-color="#dde8cb" draw:end-color="#ffd7d7"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300"
draw:border="0%"/><draw:gradient draw:name="Pastel_20_Dream"
draw:display-name="Pastel Dream" draw:style="rectangular" draw:cx="50%"
draw:cy="50%" draw:start-color="#ffd7d7" draw:end-color="#b4c7dc"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450"
draw:border="0%"/><draw:gradient draw:name="Blue_20_Touch"
draw:display-name="Blue Touch" draw:style="linear" draw:start-color="#b4c7dc"
draw:end-color="#dee6ef" draw:start-intensity
="100%" draw:end-intensity="100%" draw:angle="10"
draw:border="0%"/><draw:gradient draw:name="Blank_20_with_20_Gray"
draw:display-name="Blank with Gray" draw:style="linear"
draw:start-color="#ffffff" draw:end-color="#dddddd" draw:start-intensity="100%"
draw:end-intensity="100%" draw:angle="900" draw:border="75%"/><draw:gradient
draw:name="Spotted_20_Gray" draw:display-name="Spotted Gray"
draw:style="radial" draw:cx="50%" draw:cy="50%" draw:start-color="#b2b2b2"
draw:end-color="#eeeeee" draw:start-intensity="100%" draw:end-intensity="100%"
draw:border="0%"/><draw:gradient draw:name="London_20_Mist"
draw:display-name="London Mist" draw:style="linear" draw:start-color="#cccccc"
draw:end-color="#666666" draw:start-intensity="100%" draw:end-intensity="100%"
draw:angle="300" draw:border="0%"/><draw:gradient
draw:name="Teal_20_to_20_Blue" draw:display-name="Teal to Blue"
draw:style="linear" draw:start-color="#50938a" draw:end-color="#5983b0"
draw:start-intensity="100%" draw:end-intensity="
100%" draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Midnight"
draw:style="linear" draw:start-color="#000000" draw:end-color="#2a6099"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0"
draw:border="0%"/><draw:gradient draw:name="Deep_20_Ocean"
draw:display-name="Deep Ocean" draw:style="radial" draw:cx="50%" draw:cy="50%"
draw:start-color="#00000" draw:end-color="#729fcf" draw:start-intensity="100%"
draw:end-intensity="100%" draw:border="0%"/><draw:gradient
draw:name="Submarine" draw:style="linear" draw:start-color="#dde8cb"
draw:end-color="#b4c7dc" draw:start-intensity="100%" draw:end-intensity="100%"
draw:angle="0" draw:border="0%"/><draw:gradient draw:name="Green_20_Grass"
draw:display-name="Green Grass" draw:style="linear" draw:start-color="#ffff00"
draw:end-color="#81d41a" draw:start-intensity="100%" draw:end-intensity="100%"
draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Neon_20_Light"
draw:display-name="Neon Light" draw:style="ell
ipsoid" draw:cx="50%" draw:cy="50%" draw:start-color="#127622"
draw:end-color="#ffffff" draw:start-intensity="100%" draw:end-intensity="100%"
draw:angle="0" draw:border="15%"/><draw:gradient draw:name="Sunshine"
draw:style="radial" draw:cx="66%" draw:cy="33%" draw:start-color="#ffbf00"
draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%"
draw:border="33%"/><draw:gradient draw:name="Present" draw:style="square"
draw:cx="70%" draw:cy="60%" draw:start-color="#813709" draw:end-color="#ff4000"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450"
draw:border="72%"/><draw:gradient draw:name="Mahogany" draw:style="square"
draw:cx="50%" draw:cy="50%" draw:start-color="#000000" draw:end-color="#8d281e"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450"
draw:border="0%"/></ooo:gradient-table>
+<?xml version="1.0"?>
+<!-- <?xml version="1.0" encoding="UTF-8"?> -->
+<ooo:gradient-table
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:svg="http://www.w3.org/2000/svg";
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"><draw:gradient
draw:name="Pastel_20_Bouquet" draw:display-name="Pastel Bouquet"
draw:style="linear" draw:start-color="#dde8cb" draw:end-color="#ffd7d7"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="300"
draw:border="0%"/><draw:gradient draw:name="Pastel_20_Dream"
draw:display-name="Pastel Dream" draw:style="rectangular" draw:cx="50%"
draw:cy="50%" draw:start-color="#ffd7d7" draw:end-color="#b4c7dc"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450"
draw:border="0%"/><draw:gradient draw:name="Blue_20_Touch"
draw:display-name="Blue Touch" draw:style="linear" draw:start-color="#b4c7dc"
draw:end-
color="#dee6ef" draw:start-intensity="100%" draw:end-intensity="100%"
draw:angle="10" draw:border="0%"/><draw:gradient
draw:name="Blank_20_with_20_Gray" draw:display-name="Blank with Gray"
draw:style="linear" draw:start-color="#ffffff" draw:end-color="#dddddd"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="900"
draw:border="75%"/><draw:gradient draw:name="London_20_Mist"
draw:display-name="London Mist" draw:style="linear" draw:start-color="#cccccc"
draw:end-color="#666666" draw:start-intensity="100%" draw:end-intensity="100%"
draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Submarine"
draw:style="linear" draw:start-color="#dde8cb" draw:end-color="#b4c7dc"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0"
draw:border="0%"/><draw:gradient draw:name="Midnight" draw:style="linear"
draw:start-color="#000000" draw:end-color="#2a6099" draw:start-intensity="100%"
draw:end-intensity="100%" draw:angle="0" draw:border="0%"/><draw:gradient draw:
name="Deep_20_Ocean" draw:display-name="Deep Ocean" draw:style="radial"
draw:cx="50%" draw:cy="50%" draw:start-color="#00000" draw:end-color="#729fcf"
draw:start-intensity="100%" draw:end-intensity="100%"
draw:border="0%"/><draw:gradient draw:name="Mahogany" draw:style="square"
draw:cx="50%" draw:cy="50%" draw:start-color="#000000" draw:end-color="#8d281e"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="450"
draw:border="0%"/><draw:gradient draw:name="Green_20_Grass"
draw:display-name="Green Grass" draw:style="linear" draw:start-color="#ffff00"
draw:end-color="#81d41a" draw:start-intensity="100%" draw:end-intensity="100%"
draw:angle="300" draw:border="0%"/><draw:gradient draw:name="Neon_20_Light"
draw:display-name="Neon Light" draw:style="ellipsoid" draw:cx="50%"
draw:cy="50%" draw:start-color="#127622" draw:end-color="#ffffff"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0"
draw:border="15%"/><draw:gradient draw:name="Sunshine" draw:style="rad
ial" draw:cx="66%" draw:cy="33%" draw:start-color="#ffbf00"
draw:end-color="#ffff00" draw:start-intensity="100%" draw:end-intensity="100%"
draw:border="33%"/><draw:gradient draw:name="Rainbow" draw:style="radial"
draw:cx="50%" draw:cy="100%"><loext:gradient-stop svg:offset="0.2"
loext:color-type="rgb" loext:color-value="#ffffff"/><loext:gradient-stop
svg:offset="0.2" loext:color-type="rgb"
loext:color-value="#ff0000"/><loext:gradient-stop svg:offset="0.4"
loext:color-type="rgb" loext:color-value="#ffff00"/><loext:gradient-stop
svg:offset="0.5" loext:color-type="rgb"
loext:color-value="#00ff00"/><loext:gradient-stop svg:offset="0.65"
loext:color-type="rgb" loext:color-value="#00ffff"/><loext:gradient-stop
svg:offset="0.8" loext:color-type="rgb"
loext:color-value="#ff00ff"/><loext:gradient-stop svg:offset="0.8"
loext:color-type="rgb"
loext:color-value="#ffffff"/></draw:gradient><draw:gradient draw:name="Sunrise"
draw:style="linear"><loext:gradient-stop svg:offset="0.0" loext:color-typ
e="rgb" loext:color-value="#38a8b6"/><loext:gradient-stop svg:offset="0.5"
loext:color-type="rgb" loext:color-value="#81c8c4"/><loext:gradient-stop
svg:offset="0.75" loext:color-type="rgb"
loext:color-value="#b7ceb2"/><loext:gradient-stop svg:offset="1.0"
loext:color-type="rgb"
loext:color-value="#d6a085"/></draw:gradient><draw:gradient draw:name="Sundown"
draw:style="linear"><loext:gradient-stop svg:offset="0.0"
loext:color-type="rgb" loext:color-value="#0f0b57"/><loext:gradient-stop
svg:offset="0.3" loext:color-type="rgb"
loext:color-value="#644eb0"/><loext:gradient-stop svg:offset="0.5"
loext:color-type="rgb" loext:color-value="#d392d6"/><loext:gradient-stop
svg:offset="0.75" loext:color-type="rgb"
loext:color-value="#febbc2"/><loext:gradient-stop svg:offset="1.0"
loext:color-type="rgb"
loext:color-value="#ffbb70"/></draw:gradient></ooo:gradient-table>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 249d01060a39..eb8ca335f91c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -783,17 +783,17 @@
#define RID_SVXSTR_GRDT71
NC_("RID_SVXSTR_GRDT71", "Pastel Dream")
#define RID_SVXSTR_GRDT72
NC_("RID_SVXSTR_GRDT72", "Blue Touch")
#define RID_SVXSTR_GRDT73
NC_("RID_SVXSTR_GRDT73", "Blank with Gray")
-#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "Spotted Gray")
-#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "London Mist")
-#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Teal to Blue")
-#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Midnight")
-#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Deep Ocean")
-#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Submarine")
-#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Green Grass")
-#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Neon Light")
-#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Sunshine")
-#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Present")
-#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Mahogany")
+#define RID_SVXSTR_GRDT74
NC_("RID_SVXSTR_GRDT74", "London Mist")
+#define RID_SVXSTR_GRDT75
NC_("RID_SVXSTR_GRDT75", "Submarine")
+#define RID_SVXSTR_GRDT76
NC_("RID_SVXSTR_GRDT76", "Midnight")
+#define RID_SVXSTR_GRDT77
NC_("RID_SVXSTR_GRDT77", "Deep Ocean")
+#define RID_SVXSTR_GRDT78
NC_("RID_SVXSTR_GRDT78", "Mahogany")
+#define RID_SVXSTR_GRDT79
NC_("RID_SVXSTR_GRDT79", "Green Grass")
+#define RID_SVXSTR_GRDT80
NC_("RID_SVXSTR_GRDT80", "Neon Light")
+#define RID_SVXSTR_GRDT81
NC_("RID_SVXSTR_GRDT81", "Sunshine")
+#define RID_SVXSTR_GRDT82
NC_("RID_SVXSTR_GRDT82", "Rainbow")
+#define RID_SVXSTR_GRDT83
NC_("RID_SVXSTR_GRDT83", "Sunrise")
+#define RID_SVXSTR_GRDT84
NC_("RID_SVXSTR_GRDT84", "Sunset")
// /gradients
#define RID_SVXSTR_HATCH0
NC_("RID_SVXSTR_HATCH0", "Black 0 Degrees")
#define RID_SVXSTR_HATCH1
NC_("RID_SVXSTR_HATCH1", "Black 90 Degrees")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 1c917bee9318..17302aa13ae0 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -192,17 +192,17 @@ inline constexpr OUStringLiteral RID_SVXSTR_GRDT70_DEF
= u
inline constexpr OUStringLiteral RID_SVXSTR_GRDT71_DEF =
u"Pastel Dream";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT72_DEF =
u"Blue Touch";
inline constexpr OUStringLiteral RID_SVXSTR_GRDT73_DEF =
u"Blank with Gray";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT74_DEF =
u"Spotted Gray";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT75_DEF =
u"London Mist";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT76_DEF =
u"Teal to Blue";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT77_DEF =
u"Midnight";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT78_DEF =
u"Deep Ocean";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT79_DEF =
u"Submarine";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT80_DEF =
u"Green Grass";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT81_DEF =
u"Neon Light";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT82_DEF =
u"Sunshine";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT83_DEF =
u"Present";
-inline constexpr OUStringLiteral RID_SVXSTR_GRDT84_DEF =
u"Mahogany";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT74_DEF =
u"London Mist";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT75_DEF =
u"Submarine";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT76_DEF =
u"Midnight";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT77_DEF =
u"Deep Ocean";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT78_DEF =
u"Mahogany";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT79_DEF =
u"Green Grass";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT80_DEF =
u"Neon Light";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT81_DEF =
u"Sunshine";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT82_DEF =
u"Rainbow";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT83_DEF =
u"Sunrise";
+inline constexpr OUStringLiteral RID_SVXSTR_GRDT84_DEF =
u"Sunset";
// Reference-strings for standard-hatch-table
inline constexpr OUStringLiteral RID_SVXSTR_HATCH0_DEF =
u"Black 0 Degrees";
inline constexpr OUStringLiteral RID_SVXSTR_HATCH1_DEF =
u"Black 90 Degrees";
