diff options
| -rw-r--r-- | extras/source/palettes/standard.sog | 2 | ||||
| -rw-r--r-- | include/svx/strings.hrc | 2 | ||||
| -rw-r--r-- | svx/inc/strings.hxx | 2 | ||||
| -rw-r--r-- | uitest/impress_tests/backgrounds.py | 2 | ||||
| -rw-r--r-- | uitest/writer_tests/pageDialog.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/extras/source/palettes/standard.sog b/extras/source/palettes/standard.sog index 464e72aefa50..665ec064a4ce 100644 --- a/extras/source/palettes/standard.sog +++ b/extras/source/palettes/standard.sog @@ -1 +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="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> +<!-- <?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="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 5e290fe5600b..3998d98600cf 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -743,7 +743,7 @@ #define RID_SVXSTR_GRDT68 NC_("RID_SVXSTR_GRDT68", "Night") #define RID_SVXSTR_GRDT69 NC_("RID_SVXSTR_GRDT69", "Green Gradient") //actual gradients defined for 6.1 -#define RID_SVXSTR_GRDT70 NC_("RID_SVXSTR_GRDT70", "Pastel Bouqet") +#define RID_SVXSTR_GRDT70 NC_("RID_SVXSTR_GRDT70", "Pastel Bouquet") #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") diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx index 3bcd02597c38..b0869793f2cc 100644 --- a/svx/inc/strings.hxx +++ b/svx/inc/strings.hxx @@ -164,7 +164,7 @@ #define RID_SVXSTR_GRDT68_DEF "Night" #define RID_SVXSTR_GRDT69_DEF "Green Gradient" //actual gradients defined for 6.1 -#define RID_SVXSTR_GRDT70_DEF "Pastel Bouqet" +#define RID_SVXSTR_GRDT70_DEF "Pastel Bouquet" #define RID_SVXSTR_GRDT71_DEF "Pastel Dream" #define RID_SVXSTR_GRDT72_DEF "Blue Touch" #define RID_SVXSTR_GRDT73_DEF "Blank with Gray" diff --git a/uitest/impress_tests/backgrounds.py b/uitest/impress_tests/backgrounds.py index 642db9f3681e..b0c36db36ab4 100644 --- a/uitest/impress_tests/backgrounds.py +++ b/uitest/impress_tests/backgrounds.py @@ -38,7 +38,7 @@ class ImpressBackgrounds(UITestCase): self.assertEqual( document.DrawPages.getByIndex(0).Background.FillGradient.EndIntensity, 100) self.assertEqual( - document.DrawPages.getByIndex(0).Background.FillGradientName, 'Pastel Bouqet') + document.DrawPages.getByIndex(0).Background.FillGradientName, 'Pastel Bouquet') 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 2c03718e26e7..8165008d4f2b 100644 --- a/uitest/writer_tests/pageDialog.py +++ b/uitest/writer_tests/pageDialog.py @@ -59,7 +59,7 @@ class WriterPageDialog(UITestCase): self.assertEqual( document.StyleFamilies.PageStyles.Standard.FillGradient.EndIntensity, 100) self.assertEqual( - document.StyleFamilies.PageStyles.Standard.FillGradientName, 'Pastel Bouqet') + document.StyleFamilies.PageStyles.Standard.FillGradientName, 'Pastel Bouquet') elif btn == 'btnhatch': self.assertEqual( document.StyleFamilies.PageStyles.Standard.FillHatch.Style, SINGLE ) |