diff options
| -rw-r--r-- | extras/source/palettes/standard.sog | 230 | ||||
| -rw-r--r-- | include/svx/strings.hrc | 36 | ||||
| -rw-r--r-- | svx/inc/strings.hxx | 34 | ||||
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 10 | ||||
| -rw-r--r-- | uitest/impress_tests/backgrounds.py | 6 | ||||
| -rw-r--r-- | uitest/writer_tests/pageDialog.py | 4 |
6 files changed, 42 insertions, 278 deletions
diff --git a/extras/source/palettes/standard.sog b/extras/source/palettes/standard.sog index eab2b15792a2..464e72aefa50 100644 --- a/extras/source/palettes/standard.sog +++ b/extras/source/palettes/standard.sog @@ -1,229 +1 @@ -<?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="Tango_20_green" -draw:display-name="Tango Green" -draw:style="linear" -draw:end-color="#4e9a06" -draw:start-color="#8ae234" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="300" -draw:border="0%"/> - -<draw:gradient -draw:name="subtle_20_Tango_20_green" -draw:display-name="Subtle Tango Green" -draw:style="linear" -draw:end-color="#5c8526" -draw:start-color="#94bd5e" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="600" -draw:border="0%"/> - -<draw:gradient -draw:name="Tango_20_purple" -draw:display-name="Tango Purple" -draw:style="linear" -draw:end-color="#5c3566" -draw:start-color="#ad7fa8" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="300" -draw:border="0%"/> - -<draw:gradient -draw:name="Tango_20_red" -draw:display-name="Tango Red" -draw:style="linear" -draw:end-color="#a40000" -draw:start-color="#ef2929" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="300" -draw:border="0%"/> - -<draw:gradient -draw:name="Tango_20_blue" -draw:display-name="Tango Blue" -draw:style="linear" -draw:end-color="#204a87" -draw:start-color="#729fcf" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="300" -draw:border="0%"/> - -<draw:gradient -draw:name="Tango_20_yellow" -draw:display-name="Tango Yellow" -draw:style="linear" -draw:end-color="#c4a000" -draw:start-color="#fce94f" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="300" -draw:border="0%"/> - -<draw:gradient -draw:name="Tango_20_orange" -draw:display-name="Tango Orange" -draw:style="linear" -draw:end-color="#ce5c00" -draw:start-color="#fcaf3e" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="300" -draw:border="0%"/> - -<draw:gradient -draw:name="Tango_20_gray" -draw:display-name="Tango Gray" -draw:style="linear" -draw:end-color="#555753" -draw:start-color="#babdb6" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="300" -draw:border="0%"/> - -<draw:gradient -draw:name="clay" -draw:display-name="Clay" -draw:style="linear" -draw:end-color="#968751" -draw:start-color="#423c24" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="600" -draw:border="0%"/> - -<draw:gradient -draw:name="olive_20_green" -draw:display-name="Olive Green" -draw:style="linear" -draw:end-color="#83a67f" -draw:start-color="#3f4f3d" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="600" -draw:border="0%"/> - - - -<draw:gradient -draw:name="silver" -draw:display-name="Silver" -draw:style="linear" -draw:start-color="#4c4c4c" -draw:end-color="#b3b3b3" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="300" -draw:border="0%"/> - -<draw:gradient -draw:name="sunburst" -draw:display-name="Sunburst" -draw:style="radial" -draw:cx="30%" -draw:cy="30%" -draw:start-color="#800000" -draw:end-color="#ffff00" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:border="20%"/> - -<draw:gradient -draw:name="Radial_20_red_2f_yellow" -draw:display-name="Radial red/yellow" -draw:style="radial" -draw:cx="50%" -draw:cy="50%" -draw:start-color="#ff3333" -draw:end-color="#e6ff00" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:border="0%"/> - -<draw:gradient -draw:name="brownie" -draw:display-name="Brownie" -draw:style="linear" -draw:start-color="#663300" -draw:end-color="#ff6633" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="600" -draw:border="0%"/> - -<draw:gradient -draw:name="sunset" -draw:display-name="Sunset" -draw:style="linear" -draw:start-color="#333366" -draw:end-color="#9999cc" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="2250" -draw:border="0%"/> - -<draw:gradient -draw:name="deep_20_green" -draw:display-name="Deep Green" -draw:style="linear" -draw:start-color="#314004" -draw:end-color="#aecf00" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="2250" -draw:border="0%"/> -<draw:gradient -draw:name="deep_20_orange" -draw:display-name="Deep Orange" -draw:style="linear" -draw:start-color="#ff950e" -draw:end-color="#c5000b" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="450" -draw:border="0%"/> - -<draw:gradient -draw:name="deep_20_blue" -draw:display-name="Deep Blue" -draw:style="linear" -draw:start-color="#204a87" -draw:end-color="#729fcf" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="150" -draw:border="0%"/> - -<draw:gradient -draw:name="purple_20_haze" -draw:display-name="Purple Haze" -draw:style="linear" -draw:start-color="#660066" -draw:end-color="#ff8080" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:angle="450" -draw:border="0%"/> - -<draw:gradient -draw:name="Gradient_20_1" -draw:display-name="Gradient 1" -draw:style="radial" -draw:cx="25%" -draw:cy="0%" -draw:start-color="#666600" -draw:end-color="#cccc00" -draw:start-intensity="100%" -draw:end-intensity="100%" -draw:border="0%"/> - - -</ooo:gradient-table> +<!-- <?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_Bouqet" draw:display-name="Pastel Bouqet" 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="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="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="Mahagoni" 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> diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index c38e028bf76a..5e290fe5600b 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -730,6 +730,7 @@ #define RID_SVXSTR_GRDT56 NC_("RID_SVXSTR_GRDT56", "Vertical Red") #define RID_SVXSTR_GRDT57 NC_("RID_SVXSTR_GRDT57", "Vertical Turquoise") #define RID_SVXSTR_GRDT58 NC_("RID_SVXSTR_GRDT58", "Vertical Violet") +//gradients of unknown provenience #define RID_SVXSTR_GRDT59 NC_("RID_SVXSTR_GRDT59", "Gray Gradient") #define RID_SVXSTR_GRDT60 NC_("RID_SVXSTR_GRDT60", "Yellow Gradient") #define RID_SVXSTR_GRDT61 NC_("RID_SVXSTR_GRDT61", "Orange Gradient") @@ -741,24 +742,23 @@ #define RID_SVXSTR_GRDT67 NC_("RID_SVXSTR_GRDT67", "Purple Pipe") #define RID_SVXSTR_GRDT68 NC_("RID_SVXSTR_GRDT68", "Night") #define RID_SVXSTR_GRDT69 NC_("RID_SVXSTR_GRDT69", "Green Gradient") -#define RID_SVXSTR_GRDT70 NC_("RID_SVXSTR_GRDT70", "Tango Green") -#define RID_SVXSTR_GRDT71 NC_("RID_SVXSTR_GRDT71", "Subtle Tango Green") -#define RID_SVXSTR_GRDT72 NC_("RID_SVXSTR_GRDT72", "Tango Purple") -#define RID_SVXSTR_GRDT73 NC_("RID_SVXSTR_GRDT73", "Tango Red") -#define RID_SVXSTR_GRDT74 NC_("RID_SVXSTR_GRDT74", "Tango Blue") -#define RID_SVXSTR_GRDT75 NC_("RID_SVXSTR_GRDT75", "Tango Yellow") -#define RID_SVXSTR_GRDT76 NC_("RID_SVXSTR_GRDT76", "Tango Orange") -#define RID_SVXSTR_GRDT77 NC_("RID_SVXSTR_GRDT77", "Tango Gray") -#define RID_SVXSTR_GRDT78 NC_("RID_SVXSTR_GRDT78", "Clay") -#define RID_SVXSTR_GRDT79 NC_("RID_SVXSTR_GRDT79", "Olive Green") -#define RID_SVXSTR_GRDT80 NC_("RID_SVXSTR_GRDT80", "Silver") -#define RID_SVXSTR_GRDT81 NC_("RID_SVXSTR_GRDT81", "Sunburst") -#define RID_SVXSTR_GRDT82 NC_("RID_SVXSTR_GRDT82", "Brownie") -#define RID_SVXSTR_GRDT83 NC_("RID_SVXSTR_GRDT83", "Sunset") -#define RID_SVXSTR_GRDT84 NC_("RID_SVXSTR_GRDT84", "Deep Green") -#define RID_SVXSTR_GRDT85 NC_("RID_SVXSTR_GRDT85", "Deep Orange") -#define RID_SVXSTR_GRDT86 NC_("RID_SVXSTR_GRDT86", "Deep Blue") -#define RID_SVXSTR_GRDT87 NC_("RID_SVXSTR_GRDT87", "Purple Haze") +//actual gradients defined for 6.1 +#define RID_SVXSTR_GRDT70 NC_("RID_SVXSTR_GRDT70", "Pastel Bouqet") +#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", "Mahagoni") +// /gradients #define RID_SVXSTR_HATCH0 NC_("RID_SVXSTR_HATCH0", "Black 45 Degrees Wide") #define RID_SVXSTR_HATCH1 NC_("RID_SVXSTR_HATCH1", "Black 45 Degrees") #define RID_SVXSTR_HATCH2 NC_("RID_SVXSTR_HATCH2", "Black -45 Degrees") 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[] = diff --git a/uitest/impress_tests/backgrounds.py b/uitest/impress_tests/backgrounds.py index 655b67414929..642db9f3681e 100644 --- a/uitest/impress_tests/backgrounds.py +++ b/uitest/impress_tests/backgrounds.py @@ -24,7 +24,7 @@ class ImpressBackgrounds(UITestCase): self.assertEqual( document.DrawPages.getByIndex(0).Background.FillGradient.Style, LINEAR) self.assertEqual( - document.DrawPages.getByIndex(0).Background.FillGradient.StartColor, 9101876) + document.DrawPages.getByIndex(0).Background.FillGradient.StartColor, 14543051) self.assertEqual( document.DrawPages.getByIndex(0).Background.FillGradient.Angle, 300) self.assertEqual( @@ -37,8 +37,8 @@ class ImpressBackgrounds(UITestCase): document.DrawPages.getByIndex(0).Background.FillGradient.StartIntensity, 100) self.assertEqual( document.DrawPages.getByIndex(0).Background.FillGradient.EndIntensity, 100) - #self.assertEqual( - #document.DrawPages.getByIndex(0).Background.FillGradientName, 'Tango Green') + self.assertEqual( + document.DrawPages.getByIndex(0).Background.FillGradientName, 'Pastel Bouqet') elif btn == 'btnhatch': self.assertEqual( document.DrawPages.getByIndex(0).Background.FillHatch.Style, SINGLE ) diff --git a/uitest/writer_tests/pageDialog.py b/uitest/writer_tests/pageDialog.py index 9dc0a101d5e2..2c03718e26e7 100644 --- a/uitest/writer_tests/pageDialog.py +++ b/uitest/writer_tests/pageDialog.py @@ -45,7 +45,7 @@ class WriterPageDialog(UITestCase): self.assertEqual( document.StyleFamilies.PageStyles.Standard.FillGradient.Style, LINEAR) self.assertEqual( - document.StyleFamilies.PageStyles.Standard.FillGradient.StartColor, 9101876) + document.StyleFamilies.PageStyles.Standard.FillGradient.StartColor, 14543051) self.assertEqual( document.StyleFamilies.PageStyles.Standard.FillGradient.Angle, 300) self.assertEqual( @@ -59,7 +59,7 @@ class WriterPageDialog(UITestCase): self.assertEqual( document.StyleFamilies.PageStyles.Standard.FillGradient.EndIntensity, 100) self.assertEqual( - document.StyleFamilies.PageStyles.Standard.FillGradientName, 'Tango Green') + document.StyleFamilies.PageStyles.Standard.FillGradientName, 'Pastel Bouqet') elif btn == 'btnhatch': self.assertEqual( document.StyleFamilies.PageStyles.Standard.FillHatch.Style, SINGLE ) |