[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svx svx/inc svx/source
Julien Nabet (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jun 25 11:07:29 UTC 2020
include/svx/strings.hrc | 27 ++++++++++++++++-----------
svx/inc/strings.hxx | 27 ++++++++++++++++-----------
svx/source/unodraw/unoprov.cxx | 14 ++++++++++++--
3 files changed, 44 insertions(+), 24 deletions(-)
New commits:
commit 587d75bc5bcd308168bc30567ab45b08e1ae062c
Author: Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Jun 25 10:52:43 2020 +0200
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Thu Jun 25 13:06:55 2020 +0200
tdf#134291: make all hatch patterns translatable
Regression from commit 30a6e9e991fd1b62ead2d393331a0364372c52fb
tdf#130928 Area Fill update hatcch section
Change-Id: I75377f86bb8eafc24d739073e0341168637f7d62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97093
(cherry picked from commit b5be3d050c9b3ff909be4937cea0bee5fe0b6048)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97064
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 14da2224acf4..86047b4b7fa4 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -793,17 +793,22 @@
#define RID_SVXSTR_GRDT83 NC_("RID_SVXSTR_GRDT83", "Present")
#define RID_SVXSTR_GRDT84 NC_("RID_SVXSTR_GRDT84", "Mahogany")
// /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")
-#define RID_SVXSTR_HATCH3 NC_("RID_SVXSTR_HATCH3", "Black 90 Degrees")
-#define RID_SVXSTR_HATCH4 NC_("RID_SVXSTR_HATCH4", "Red Crossed 45 Degrees")
-#define RID_SVXSTR_HATCH5 NC_("RID_SVXSTR_HATCH5", "Red Crossed 0 Degrees")
-#define RID_SVXSTR_HATCH6 NC_("RID_SVXSTR_HATCH6", "Blue Crossed 45 Degrees")
-#define RID_SVXSTR_HATCH7 NC_("RID_SVXSTR_HATCH7", "Blue Crossed 0 Degrees")
-#define RID_SVXSTR_HATCH8 NC_("RID_SVXSTR_HATCH8", "Blue Triple 90 Degrees")
-#define RID_SVXSTR_HATCH9 NC_("RID_SVXSTR_HATCH9", "Black 0 Degrees")
-#define RID_SVXSTR_HATCH10 NC_("RID_SVXSTR_HATCH10", "Hatching" )
+#define RID_SVXSTR_HATCH0 NC_("RID_SVXSTR_HATCH0", "Black 0 Degrees")
+#define RID_SVXSTR_HATCH1 NC_("RID_SVXSTR_HATCH1", "Black 90 Degrees")
+#define RID_SVXSTR_HATCH2 NC_("RID_SVXSTR_HATCH2", "Black 180 Degrees Crossed")
+#define RID_SVXSTR_HATCH3 NC_("RID_SVXSTR_HATCH3", "Blue 45 Degrees")
+#define RID_SVXSTR_HATCH4 NC_("RID_SVXSTR_HATCH4", "Blue -45 Degrees")
+#define RID_SVXSTR_HATCH5 NC_("RID_SVXSTR_HATCH5", "Blue 45 Degrees Crossed")
+#define RID_SVXSTR_HATCH6 NC_("RID_SVXSTR_HATCH6", "Green 30 Degrees")
+#define RID_SVXSTR_HATCH7 NC_("RID_SVXSTR_HATCH7", "Green 60 Degrees")
+#define RID_SVXSTR_HATCH8 NC_("RID_SVXSTR_HATCH8", "Green 90 Degrees Triple")
+#define RID_SVXSTR_HATCH9 NC_("RID_SVXSTR_HATCH9", "Red 45 Degrees")
+#define RID_SVXSTR_HATCH10 NC_("RID_SVXSTR_HATCH10", "Red 90 Degrees Crossed")
+#define RID_SVXSTR_HATCH11 NC_("RID_SVXSTR_HATCH11", "Red -45 Degrees Triple")
+#define RID_SVXSTR_HATCH12 NC_("RID_SVXSTR_HATCH12", "Yellow 45 Degrees")
+#define RID_SVXSTR_HATCH13 NC_("RID_SVXSTR_HATCH13", "Yellow 45 Degrees Crossed")
+#define RID_SVXSTR_HATCH14 NC_("RID_SVXSTR_HATCH14", "Yellow 45 Degrees Triple")
+#define RID_SVXSTR_HATCH15 NC_("RID_SVXSTR_HATCH15", "Hatching")
#define RID_SVXSTR_BMP0 NC_("RID_SVXSTR_BMP0", "Empty")
#define RID_SVXSTR_BMP1 NC_("RID_SVXSTR_BMP1", "Painted White")
#define RID_SVXSTR_BMP2 NC_("RID_SVXSTR_BMP2", "Paper Texture")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 4098daebe26d..dddaf3126ae0 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -204,17 +204,22 @@
#define RID_SVXSTR_GRDT83_DEF "Present"
#define RID_SVXSTR_GRDT84_DEF "Mahogany"
// Reference-strings for standard-hatch-table
-#define RID_SVXSTR_HATCH0_DEF "Black 45 Degrees Wide"
-#define RID_SVXSTR_HATCH1_DEF "Black 45 Degrees"
-#define RID_SVXSTR_HATCH2_DEF "Black -45 Degrees"
-#define RID_SVXSTR_HATCH3_DEF "Black 90 Degrees"
-#define RID_SVXSTR_HATCH4_DEF "Red Crossed 45 Degrees"
-#define RID_SVXSTR_HATCH5_DEF "Red Crossed 0 Degrees"
-#define RID_SVXSTR_HATCH6_DEF "Blue Crossed 45 Degrees"
-#define RID_SVXSTR_HATCH7_DEF "Blue Crossed 0 Degrees"
-#define RID_SVXSTR_HATCH8_DEF "Blue Triple 90 Degrees"
-#define RID_SVXSTR_HATCH9_DEF "Black 0 Degrees"
-#define RID_SVXSTR_HATCH10_DEF "Hatching"
+#define RID_SVXSTR_HATCH0_DEF "Black 0 Degrees"
+#define RID_SVXSTR_HATCH1_DEF "Black 90 Degrees"
+#define RID_SVXSTR_HATCH2_DEF "Black 180 Degrees Crossed"
+#define RID_SVXSTR_HATCH3_DEF "Blue 45 Degrees"
+#define RID_SVXSTR_HATCH4_DEF "Blue -45 Degrees"
+#define RID_SVXSTR_HATCH5_DEF "Blue 45 Degrees Crossed"
+#define RID_SVXSTR_HATCH6_DEF "Green 30 Degrees"
+#define RID_SVXSTR_HATCH7_DEF "Green 60 Degrees"
+#define RID_SVXSTR_HATCH8_DEF "Green 90 Degrees Triple"
+#define RID_SVXSTR_HATCH9_DEF "Red 45 Degrees"
+#define RID_SVXSTR_HATCH10_DEF "Red 90 Degrees Crossed"
+#define RID_SVXSTR_HATCH11_DEF "Red -45 Degrees Triple"
+#define RID_SVXSTR_HATCH12_DEF "Yellow 45 Degrees"
+#define RID_SVXSTR_HATCH13_DEF "Yellow 45 Degrees Crossed"
+#define RID_SVXSTR_HATCH14_DEF "Yellow 45 Degrees Triple"
+#define RID_SVXSTR_HATCH15_DEF "Hatching"
// Reference-strings for standard-bitmap-table
#define RID_SVXSTR_BMP0_DEF "Empty"
#define RID_SVXSTR_BMP1_DEF "Painted White"
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 8d2849512856..037c5898b1f3 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -1536,7 +1536,12 @@ static const char* RID_SVXSTR_HATCHS_DEF[] =
RID_SVXSTR_HATCH7_DEF,
RID_SVXSTR_HATCH8_DEF,
RID_SVXSTR_HATCH9_DEF,
- RID_SVXSTR_HATCH10_DEF
+ RID_SVXSTR_HATCH10_DEF,
+ RID_SVXSTR_HATCH11_DEF,
+ RID_SVXSTR_HATCH12_DEF,
+ RID_SVXSTR_HATCH13_DEF,
+ RID_SVXSTR_HATCH14_DEF,
+ RID_SVXSTR_HATCH15_DEF
};
static const char* RID_SVXSTR_HATCHS[] =
@@ -1551,7 +1556,12 @@ static const char* RID_SVXSTR_HATCHS[] =
RID_SVXSTR_HATCH7,
RID_SVXSTR_HATCH8,
RID_SVXSTR_HATCH9,
- RID_SVXSTR_HATCH10
+ RID_SVXSTR_HATCH10,
+ RID_SVXSTR_HATCH11,
+ RID_SVXSTR_HATCH12,
+ RID_SVXSTR_HATCH13,
+ RID_SVXSTR_HATCH14,
+ RID_SVXSTR_HATCH15
};
static const char* RID_SVXSTR_TRASNGR_DEF[] =
More information about the Libreoffice-commits
mailing list