[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - extras/source
extras/source/shellnew/soffice.odg |binary extras/source/shellnew/soffice.ods |binary extras/source/shellnew/soffice.odt |binary 3 files changed New commits: commit 6865a25e2c6bdeff21be8368127adaed1992b3a1 Author: Rene Engelhard AuthorDate: Mon Jun 1 09:24:40 2020 +0200 Commit: Andras Timar CommitDate: Wed Jun 3 21:02:20 2020 +0200 deb#961473 set A4 in extras/source/shellnew templates it's far more used in the world than "US Letter" Change-Id: I7dbbefc9bde543967e1f3039890bbff91fc1459c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95422 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/extras/source/shellnew/soffice.odg b/extras/source/shellnew/soffice.odg index 0df6408db875..ac06d224ec84 100644 Binary files a/extras/source/shellnew/soffice.odg and b/extras/source/shellnew/soffice.odg differ diff --git a/extras/source/shellnew/soffice.ods b/extras/source/shellnew/soffice.ods index 2f3bcbc60319..33782b08fedf 100644 Binary files a/extras/source/shellnew/soffice.ods and b/extras/source/shellnew/soffice.ods differ diff --git a/extras/source/shellnew/soffice.odt b/extras/source/shellnew/soffice.odt index 679cc6493cc6..be6efc69f714 100644 Binary files a/extras/source/shellnew/soffice.odt and b/extras/source/shellnew/soffice.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - extras/source
extras/source/templates/presnt/Alizarin/styles.xml| 80 ++--- extras/source/templates/presnt/Beehive/styles.xml | 82 ++--- extras/source/templates/presnt/Blue_Curve/styles.xml | 80 ++--- extras/source/templates/presnt/Blueprint_Plans/styles.xml | 80 ++--- extras/source/templates/presnt/BrightBlue/styles.xml | 58 ++-- extras/source/templates/presnt/Classy_Red/content.xml |2 extras/source/templates/presnt/Classy_Red/styles.xml | 94 +++--- extras/source/templates/presnt/DNA/styles.xml | 50 +-- extras/source/templates/presnt/Focus/styles.xml | 120 extras/source/templates/presnt/Forestbird/styles.xml | 130 - extras/source/templates/presnt/Impress/styles.xml | 88 +++--- extras/source/templates/presnt/Inspiration/styles.xml | 60 ++-- extras/source/templates/presnt/Lights/styles.xml | 106 +++ extras/source/templates/presnt/LushGreen/content.xml |2 extras/source/templates/presnt/LushGreen/styles.xml | 130 - extras/source/templates/presnt/Metropolis/styles.xml | 72 ++--- extras/source/templates/presnt/Midnightblue/styles.xml| 128 - extras/source/templates/presnt/Nature_Illustration/styles.xml | 82 ++--- extras/source/templates/presnt/Pencil/styles.xml | 84 +++--- extras/source/templates/presnt/Piano/styles.xml | 82 ++--- extras/source/templates/presnt/Portfolio/styles.xml | 106 +++ extras/source/templates/presnt/Sunset/content.xml |2 extras/source/templates/presnt/Sunset/styles.xml | 60 ++-- extras/source/templates/presnt/Vintage/content.xml|4 extras/source/templates/presnt/Vintage/styles.xml | 140 +- extras/source/templates/presnt/Vivid/content.xml |4 extras/source/templates/presnt/Vivid/styles.xml | 110 +++ 27 files changed, 1017 insertions(+), 1019 deletions(-) New commits: commit 8c014938c523a4ee1bd8950781fe2a830b08cef1 Author: Laurent BP AuthorDate: Sun Oct 13 21:02:17 2019 +0200 Commit: Miklos Vajna CommitDate: Tue Feb 4 11:03:40 2020 +0100 tdf#114746 Restore asian and complex tags in Impress templates Manually add tags to fix size, bold and italic: style:font-size-asian style:font-size-complex style:font-style-asian style:font-style-complex style:font-weight-asian style:font-weight-complex Change-Id: I2c23ad83296c73b6e4c028cbb5a10d4b62d1e134 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86074 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/extras/source/templates/presnt/Alizarin/styles.xml b/extras/source/templates/presnt/Alizarin/styles.xml index a26391f3e6a1..641a35814de5 100644 --- a/extras/source/templates/presnt/Alizarin/styles.xml +++ b/extras/source/templates/presnt/Alizarin/styles.xml @@ -21,7 +21,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -100,36 +100,36 @@ - + - + - + - + - + - + - + @@ -140,7 +140,7 @@ - + @@ -193,39 +193,39 @@ - + - + - + - + - + - + - + - + - + @@ -275,7 +275,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -336,12 +336,12 @@ - + - + @@ -389,39 +389,39 @@ - + - + - + - + - + - + - + - + - + @@ -471,7 +471,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -600,20 +600,20 @@ - + - +
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - extras/source include/svx svx/inc
extras/source/palettes/standard.sog |2 +-
include/svx/strings.hrc |2 +-
svx/inc/strings.hxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit cea9ac1a30698d280e195cb7a1912b8d45dff91e
Author: Heiko Tietze
AuthorDate: Wed Nov 27 08:32:21 2019 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Nov 27 13:29:45 2019 +0100
Resolves tdf#129052 - Misspelled gradient
“Mahagoni” => “Mahogany”
Change-Id: I7bc63a7353f850366b153802ec8d7272340e3095
Reviewed-on: https://gerrit.libreoffice.org/83856
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
(cherry picked from commit 464f19536c2864a911f089d2988be2c3c3ce79b6)
Reviewed-on: https://gerrit.libreoffice.org/83877
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/extras/source/palettes/standard.sog
b/extras/source/palettes/standard.sog
index 665ec064a4ce..036faa856de4 100644
--- a/extras/source/palettes/standard.sog
+++ b/extras/source/palettes/standard.sog
@@ -1 +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 d6d8c510ec03..3eea6ce8aa4c 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -788,7 +788,7 @@
#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")
+#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")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 353b97c54c83..0162a333a650 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -202,7 +202,7 @@
#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"
+#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"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
