[Libreoffice-commits] core.git: extras/source include/svx svx/inc svx/source
andreas kainz (via logerrit)
logerrit at kemper.freedesktop.org
Tue Apr 14 22:39:15 UTC 2020
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 <kainz.a at gmail.com>
AuthorDate: Tue Apr 14 23:57:19 2020 +0200
Commit: andreas_kainz <kainz.a at gmail.com>
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 <kainz.a at gmail.com>
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,
+ RID_SVXSTR_BMP78_DEF,
+ RID_SVXSTR_BMP79_DEF,
+ RID_SVXSTR_BMP80_DEF,
+ RID_SVXSTR_BMP81_DEF,
+ RID_SVXSTR_BMP82_DEF,
+ RID_SVXSTR_BMP83_DEF,
+ RID_SVXSTR_BMP84_DEF,
+ RID_SVXSTR_BMP85_DEF,
+ RID_SVXSTR_BMP86_DEF,
+ RID_SVXSTR_BMP87_DEF,
+ RID_SVXSTR_BMP88_DEF,
+ RID_SVXSTR_BMP89_DEF,
+ RID_SVXSTR_BMP90_DEF,
+ RID_SVXSTR_BMP91_DEF,
+ RID_SVXSTR_BMP92_DEF
};
static const char* RID_SVXSTR_BMP[] =
@@ -1174,7 +1191,24 @@ static const char* RID_SVXSTR_BMP[] =
RID_SVXSTR_BMP72,
RID_SVXSTR_BMP73,
RID_SVXSTR_BMP74,
- RID_SVXSTR_BMP75
+ RID_SVXSTR_BMP75,
+ RID_SVXSTR_BMP76,
+ RID_SVXSTR_BMP77,
+ RID_SVXSTR_BMP78,
+ RID_SVXSTR_BMP79,
+ RID_SVXSTR_BMP80,
+ RID_SVXSTR_BMP81,
+ RID_SVXSTR_BMP82,
+ RID_SVXSTR_BMP83,
+ RID_SVXSTR_BMP84,
+ RID_SVXSTR_BMP85,
+ RID_SVXSTR_BMP86,
+ RID_SVXSTR_BMP87,
+ RID_SVXSTR_BMP88,
+ RID_SVXSTR_BMP89,
+ RID_SVXSTR_BMP90,
+ RID_SVXSTR_BMP91,
+ RID_SVXSTR_BMP92
};
static const char* RID_SVXSTR_DASH_DEF[] =
More information about the Libreoffice-commits
mailing list