[Libreoffice-commits] core.git: extras/source include/svx svx/inc svx/source

2020-04-14 Thread andreas kainz (via logerrit) 
 extras/source/palettes/standard.sob |binary
 include/svx/strings.hrc |   14 +
 svx/inc/strings.hxx |   14 +
 svx/source/unodraw/unoprov.cxx  |   38 ++--
 4 files changed, 64 insertions(+), 2 deletions(-)

New commits:
commit d0e65ec5d48a1d1febfe6a2a25df2e6916e2a843
Author: andreas kainz 
AuthorDate: Tue Apr 14 23:57:19 2020 +0200
Commit: andreas_kainz 
CommitDate: Wed Apr 15 00:38:37 2020 +0200

Add Area fill bitmap presets

Change-Id: I3093f03d4d43008563fa038c1e49c33009eba289
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92232
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/extras/source/palettes/standard.sob 
b/extras/source/palettes/standard.sob
index 9fb99079d7a7..1acb3fec453f 100644
Binary files a/extras/source/palettes/standard.sob and 
b/extras/source/palettes/standard.sob differ
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 09d0f5b8d4d3..ee7a4031ade0 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -826,6 +826,20 @@
 #define RID_SVXSTR_BMP19
NC_("RID_SVXSTR_BMP19", "Night Sky")
 #define RID_SVXSTR_BMP20
NC_("RID_SVXSTR_BMP20", "Pool")
 #define RID_SVXSTR_BMP21
NC_("RID_SVXSTR_BMP21", "Bitmap")
+#define RID_SVXSTR_BMP79
NC_("RID_SVXSTR_BMP79", "Invoiced Paper")
+#define RID_SVXSTR_BMP80
NC_("RID_SVXSTR_BMP80", "Concrete")
+#define RID_SVXSTR_BMP81
NC_("RID_SVXSTR_BMP81", "Brick Wall")
+#define RID_SVXSTR_BMP82
NC_("RID_SVXSTR_BMP82", "Stone Wall")
+#define RID_SVXSTR_BMP83
NC_("RID_SVXSTR_BMP83", "Floral")
+#define RID_SVXSTR_BMP84
NC_("RID_SVXSTR_BMP84", "Space")
+#define RID_SVXSTR_BMP85
NC_("RID_SVXSTR_BMP85", "Ice light")
+#define RID_SVXSTR_BMP86
NC_("RID_SVXSTR_BMP86", "Marble")
+#define RID_SVXSTR_BMP87
NC_("RID_SVXSTR_BMP87", "Sand light")
+#define RID_SVXSTR_BMP88
NC_("RID_SVXSTR_BMP88", "Stone")
+#define RID_SVXSTR_BMP89
NC_("RID_SVXSTR_BMP89", "White Diffusion")
+#define RID_SVXSTR_BMP90
NC_("RID_SVXSTR_BMP90", "Surface")
+#define RID_SVXSTR_BMP91
NC_("RID_SVXSTR_BMP91", "Cardboard")
+#define RID_SVXSTR_BMP92
NC_("RID_SVXSTR_BMP92", "Studio")
 #define RID_SVXSTR_BMP22
NC_("RID_SVXSTR_BMP22", "5 Percent")
 #define RID_SVXSTR_BMP23
NC_("RID_SVXSTR_BMP23", "10 Percent")
 #define RID_SVXSTR_BMP24
NC_("RID_SVXSTR_BMP24", "20 Percent")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 517040ea3701..7c7e5a40ae4c 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -238,6 +238,20 @@
 #define RID_SVXSTR_BMP19_DEF"Night Sky"
 #define RID_SVXSTR_BMP20_DEF"Pool"
 #define RID_SVXSTR_BMP21_DEF"Bitmap"
+#define RID_SVXSTR_BMP79_DEF"Invoiced Paper"
+#define RID_SVXSTR_BMP80_DEF"Concrete"
+#define RID_SVXSTR_BMP81_DEF"Brick Wall"
+#define RID_SVXSTR_BMP82_DEF"Stone Wall"
+#define RID_SVXSTR_BMP83_DEF"Floral"
+#define RID_SVXSTR_BMP84_DEF"Space"
+#define RID_SVXSTR_BMP85_DEF"Ice light"
+#define RID_SVXSTR_BMP86_DEF"Marble"
+#define RID_SVXSTR_BMP87_DEF"Sand light"
+#define RID_SVXSTR_BMP88_DEF"Stone"
+#define RID_SVXSTR_BMP89_DEF"White Diffusion"
+#define RID_SVXSTR_BMP90_DEF"Surface"
+#define RID_SVXSTR_BMP91_DEF"Cardboard"
+#define RID_SVXSTR_BMP92_DEF"Studio"
 // Reference strings for patterns - they are a variation of bitmaps
 #define RID_SVXSTR_BMP22_DEF"5 Percent"
 #define RID_SVXSTR_BMP23_DEF"10 Percent"
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 60db1d865e5f..3630ec2d65b2 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1094,7 +1094,24 @@ static const char* RID_SVXSTR_BMP_DEF[] =
 RID_SVXSTR_BMP72_DEF,
 RID_SVXSTR_BMP73_DEF,
 RID_SVXSTR_BMP74_DEF,
-RID_SVXSTR_BMP75_DEF
+RID_SVXSTR_BMP75_DEF,
+RID_SVXSTR_BMP76_DEF,
+RID_SVXSTR_BMP77_DEF,
+

[Libreoffice-commits] core.git: extras/source include/svx svx/inc svx/source uitest/impress_tests uitest/writer_tests

2018-05-09 Thread heiko tietze 
 extras/source/palettes/standard.sog |  230 
 include/svx/strings.hrc |   36 ++---
 svx/inc/strings.hxx |   34 ++---
 svx/source/unodraw/unoprov.cxx  |   10 -
 uitest/impress_tests/backgrounds.py |6 
 uitest/writer_tests/pageDialog.py   |4 
 6 files changed, 42 insertions(+), 278 deletions(-)

New commits:
commit c3ec2fb53c68547deda0724315841c818a39fb12
Author: heiko tietze 
Date:   Mon May 7 13:07:01 2018 +0200

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 

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 @@
-
-http://www.w3.org/1999/xlink; 
xmlns:svg="http://www.w3.org/2000/svg; 
xmlns:ooo="http://openoffice.org/2004/office;>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+http://www.w3.org/1999/xlink; 
xmlns:svg="http://www.w3.org/2000/svg; 
xmlns:ooo="http://openoffice.org/2004/office;>
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