From 23d2f9c571baf4165c9aa3b81f32073f70045ead Mon Sep 17 00:00:00 2001 From: andreas kainz Date: Wed, 29 Apr 2020 14:15:28 +0200 Subject: tdf#132138 Update Lush Green impress template Change-Id: I52e3480ded1892fb29c1b4a0537235d1af52370b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93153 Tested-by: Jenkins Reviewed-by: andreas_kainz --- extras/CustomTarget_tplpresnt.mk | 4 - .../presnt/LushGreen/META-INF/manifest.xml | 4 - .../1000020100000640000004AD17A4D9F0A443E0A2.png | Bin 76007 -> 0 bytes .../1000020100000640000004AD5A95F4B7B86B2ED1.png | Bin 71652 -> 0 bytes .../1000020100000640000004AD88FC52DBCACCDD82.png | Bin 98921 -> 0 bytes .../1000020100000640000004ADF67714D670705C1E.png | Bin 104027 -> 0 bytes .../presnt/LushGreen/Thumbnails/thumbnail.png | Bin 10117 -> 4195 bytes .../source/templates/presnt/LushGreen/content.xml | 41 +- .../source/templates/presnt/LushGreen/styles.xml | 654 +++++++++++++-------- 9 files changed, 433 insertions(+), 270 deletions(-) delete mode 100644 extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD17A4D9F0A443E0A2.png delete mode 100644 extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD5A95F4B7B86B2ED1.png delete mode 100644 extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD88FC52DBCACCDD82.png delete mode 100644 extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004ADF67714D670705C1E.png (limited to 'extras') diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk index 917763f59146..327270628485 100644 --- a/extras/CustomTarget_tplpresnt.mk +++ b/extras/CustomTarget_tplpresnt.mk @@ -111,10 +111,6 @@ extras_PRESENTATIONS_XMLFILES := \ LushGreen/content.xml \ LushGreen/META-INF/manifest.xml \ LushGreen/meta.xml \ - LushGreen/Pictures/1000020100000640000004AD17A4D9F0A443E0A2.png \ - LushGreen/Pictures/1000020100000640000004AD5A95F4B7B86B2ED1.png \ - LushGreen/Pictures/1000020100000640000004AD88FC52DBCACCDD82.png \ - LushGreen/Pictures/1000020100000640000004ADF67714D670705C1E.png \ LushGreen/styles.xml \ LushGreen/Thumbnails/thumbnail.png \ Metropolis/content.xml \ diff --git a/extras/source/templates/presnt/LushGreen/META-INF/manifest.xml b/extras/source/templates/presnt/LushGreen/META-INF/manifest.xml index 7b5a057cb022..c3e1aec9147d 100644 --- a/extras/source/templates/presnt/LushGreen/META-INF/manifest.xml +++ b/extras/source/templates/presnt/LushGreen/META-INF/manifest.xml @@ -4,9 +4,5 @@ - - - - diff --git a/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD17A4D9F0A443E0A2.png b/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD17A4D9F0A443E0A2.png deleted file mode 100644 index 41405c76b23a..000000000000 Binary files a/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD17A4D9F0A443E0A2.png and /dev/null differ diff --git a/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD5A95F4B7B86B2ED1.png b/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD5A95F4B7B86B2ED1.png deleted file mode 100644 index f9b3db2c6b9d..000000000000 Binary files a/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD5A95F4B7B86B2ED1.png and /dev/null differ diff --git a/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD88FC52DBCACCDD82.png b/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD88FC52DBCACCDD82.png deleted file mode 100644 index c944e1412f5b..000000000000 Binary files a/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004AD88FC52DBCACCDD82.png and /dev/null differ diff --git a/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004ADF67714D670705C1E.png b/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004ADF67714D670705C1E.png deleted file mode 100644 index f47278d6d4a5..000000000000 Binary files a/extras/source/templates/presnt/LushGreen/Pictures/1000020100000640000004ADF67714D670705C1E.png and /dev/null differ diff --git a/extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png b/extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png index 417ed9e92f7b..df2f638beb84 100644 Binary files a/extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/LushGreen/Thumbnails/thumbnail.png differ diff --git a/extras/source/templates/presnt/LushGreen/content.xml b/extras/source/templates/presnt/LushGreen/content.xml index 2e339f492b0d..7b89816c2079 100644 --- a/extras/source/templates/presnt/LushGreen/content.xml +++ b/extras/source/templates/presnt/LushGreen/content.xml @@ -1,28 +1,31 @@ - + - + - + + + + - + - + @@ -31,13 +34,13 @@ - + - + @@ -57,55 +60,59 @@ - + + - + - + - + - + + - + - + + - + - + - + + diff --git a/extras/source/templates/presnt/LushGreen/styles.xml b/extras/source/templates/presnt/LushGreen/styles.xml index ebb72187afc1..a919349ff3fe 100644 --- a/extras/source/templates/presnt/LushGreen/styles.xml +++ b/extras/source/templates/presnt/LushGreen/styles.xml @@ -1,24 +1,28 @@ - + - - - - + + + + + + + + - + - + - + @@ -63,67 +67,115 @@ - - - - - - - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + - + @@ -133,10 +185,10 @@ - + - + @@ -180,40 +232,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -261,10 +313,10 @@ - + - + @@ -309,10 +361,10 @@ - + - + @@ -322,10 +374,10 @@ - + - + @@ -369,40 +421,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -450,10 +502,10 @@ - + - + @@ -498,10 +550,10 @@ - + - + @@ -511,87 +563,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -639,10 +691,10 @@ - + - + @@ -687,10 +739,10 @@ - + - + @@ -700,87 +752,89 @@ - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -828,10 +882,10 @@ - + - + @@ -876,7 +930,7 @@ - + @@ -904,64 +958,85 @@ - + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -981,16 +1056,29 @@ - + + + + + + + + + + + + + + @@ -1084,7 +1172,7 @@ - + @@ -1116,26 +1204,35 @@ - + <number> - - - - - - + + + + + + - + + + + + + + + + + - + - + @@ -1144,25 +1241,26 @@ - + - + - + - + <number> + @@ -1198,21 +1296,26 @@ - + <number> - - + + + + + + + - + - + @@ -1221,25 +1324,26 @@ - + - + - + - + <number> + @@ -1275,21 +1379,43 @@ - + <number> - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -1298,25 +1424,26 @@ - + - + - + - + <number> + @@ -1352,21 +1479,43 @@ - + <number> - - + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -1375,25 +1524,40 @@ - + - + - + - + <number> + + + + ‘‘ + + + + + + + ‘‘ + + + + @@ -1429,7 +1593,7 @@ - + <number> -- cgit v1.2.3