From 0d934971f920774c9783bd204fb4bc32d1adcb9a Mon Sep 17 00:00:00 2001 From: andreas kainz Date: Wed, 29 Apr 2020 12:52:32 +0200 Subject: tdf#132138 Update Forestbird impress template Change-Id: I86828af416941544b54ec4e9e65089184fb7e6fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93124 Tested-by: Jenkins Reviewed-by: andreas_kainz --- extras/CustomTarget_tplpresnt.mk | 4 - .../presnt/Forestbird/META-INF/manifest.xml | 4 - .../10000000000003FB000002FE917E6CB003A83232.png | Bin 15048 -> 0 bytes .../10000000000003FD000002FE4C4CDF0F4A7ED9F9.png | Bin 8265 -> 0 bytes .../10000000000003FD000002FE92464623A3FB3F6D.png | Bin 8659 -> 0 bytes .../10000201000003FC000002FE87524FDDC56B0E9E.png | Bin 11130 -> 0 bytes .../presnt/Forestbird/Thumbnails/thumbnail.png | Bin 4195 -> 2909 bytes .../source/templates/presnt/Forestbird/content.xml | 48 +- .../source/templates/presnt/Forestbird/styles.xml | 3510 ++++++++++++++++++-- 9 files changed, 3224 insertions(+), 342 deletions(-) delete mode 100644 extras/source/templates/presnt/Forestbird/Pictures/10000000000003FB000002FE917E6CB003A83232.png delete mode 100644 extras/source/templates/presnt/Forestbird/Pictures/10000000000003FD000002FE4C4CDF0F4A7ED9F9.png delete mode 100644 extras/source/templates/presnt/Forestbird/Pictures/10000000000003FD000002FE92464623A3FB3F6D.png delete mode 100644 extras/source/templates/presnt/Forestbird/Pictures/10000201000003FC000002FE87524FDDC56B0E9E.png (limited to 'extras') diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk index e4d5434d6bdc..ed99dcd5bb46 100644 --- a/extras/CustomTarget_tplpresnt.mk +++ b/extras/CustomTarget_tplpresnt.mk @@ -89,10 +89,6 @@ extras_PRESENTATIONS_XMLFILES := \ Forestbird/content.xml \ Forestbird/META-INF/manifest.xml \ Forestbird/meta.xml \ - Forestbird/Pictures/10000000000003FB000002FE917E6CB003A83232.png \ - Forestbird/Pictures/10000000000003FD000002FE4C4CDF0F4A7ED9F9.png \ - Forestbird/Pictures/10000000000003FD000002FE92464623A3FB3F6D.png \ - Forestbird/Pictures/10000201000003FC000002FE87524FDDC56B0E9E.png \ Forestbird/styles.xml \ Forestbird/Thumbnails/thumbnail.png \ Impress/content.xml \ diff --git a/extras/source/templates/presnt/Forestbird/META-INF/manifest.xml b/extras/source/templates/presnt/Forestbird/META-INF/manifest.xml index 6a0f4c3c6ca2..c3e1aec9147d 100644 --- a/extras/source/templates/presnt/Forestbird/META-INF/manifest.xml +++ b/extras/source/templates/presnt/Forestbird/META-INF/manifest.xml @@ -4,9 +4,5 @@ - - - - diff --git a/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FB000002FE917E6CB003A83232.png b/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FB000002FE917E6CB003A83232.png deleted file mode 100644 index 57c5275421e7..000000000000 Binary files a/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FB000002FE917E6CB003A83232.png and /dev/null differ diff --git a/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FD000002FE4C4CDF0F4A7ED9F9.png b/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FD000002FE4C4CDF0F4A7ED9F9.png deleted file mode 100644 index d078803c4f35..000000000000 Binary files a/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FD000002FE4C4CDF0F4A7ED9F9.png and /dev/null differ diff --git a/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FD000002FE92464623A3FB3F6D.png b/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FD000002FE92464623A3FB3F6D.png deleted file mode 100644 index 2513d670b976..000000000000 Binary files a/extras/source/templates/presnt/Forestbird/Pictures/10000000000003FD000002FE92464623A3FB3F6D.png and /dev/null differ diff --git a/extras/source/templates/presnt/Forestbird/Pictures/10000201000003FC000002FE87524FDDC56B0E9E.png b/extras/source/templates/presnt/Forestbird/Pictures/10000201000003FC000002FE87524FDDC56B0E9E.png deleted file mode 100644 index 7096691223bb..000000000000 Binary files a/extras/source/templates/presnt/Forestbird/Pictures/10000201000003FC000002FE87524FDDC56B0E9E.png and /dev/null differ diff --git a/extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png b/extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png index 318ca94ebdee..6d4c5a7d9ad5 100644 Binary files a/extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/Forestbird/Thumbnails/thumbnail.png differ diff --git a/extras/source/templates/presnt/Forestbird/content.xml b/extras/source/templates/presnt/Forestbird/content.xml index c82bf4d1dedc..61b7efa90af7 100644 --- a/extras/source/templates/presnt/Forestbird/content.xml +++ b/extras/source/templates/presnt/Forestbird/content.xml @@ -1,5 +1,5 @@ - + @@ -15,16 +15,16 @@ - + - + - + - + @@ -33,24 +33,30 @@ - + - + - + - + + + + + + + @@ -58,60 +64,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/extras/source/templates/presnt/Forestbird/styles.xml b/extras/source/templates/presnt/Forestbird/styles.xml index 03d85b49a0f9..44591b39739a 100644 --- a/extras/source/templates/presnt/Forestbird/styles.xml +++ b/extras/source/templates/presnt/Forestbird/styles.xml @@ -1,23 +1,28 @@ - + - - - - + + + + + + + + + - + - + @@ -62,67 +67,115 @@ - + - - + + - - + + - - + + + - - + + + - - - + + + - - - + + + - - - + + - - - + + + - - - - + + + - - - - + + + - - - - + + - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -132,10 +185,10 @@ - + - + @@ -179,40 +232,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -260,7 +313,7 @@ - + @@ -308,10 +361,10 @@ - + - + @@ -321,10 +374,10 @@ - + - + @@ -368,40 +421,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -449,7 +502,7 @@ - + @@ -497,10 +550,10 @@ - + - + @@ -510,10 +563,10 @@ - + - + @@ -557,40 +610,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -638,7 +691,7 @@ - + @@ -686,10 +739,10 @@ - + - + @@ -699,10 +752,10 @@ - + - + @@ -746,40 +799,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -827,7 +880,7 @@ - + @@ -875,138 +928,807 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + - - + + + - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - - + + + - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - + + + - - + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1079,13 +1801,7 @@ - - - - - - - + @@ -1117,20 +1833,26 @@ - + <number> + + + + + + - + - + - + @@ -1139,7 +1861,7 @@ - + @@ -1148,21 +1870,391 @@ - + - + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1171,7 +2263,7 @@ - + @@ -1180,7 +2272,7 @@ - + @@ -1189,25 +2281,26 @@ - + - + <number> - - - - - + + + + + + - + @@ -1216,7 +2309,7 @@ - + @@ -1225,21 +2318,203 @@ - + - + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1248,7 +2523,7 @@ - + @@ -1257,7 +2532,7 @@ - + @@ -1266,25 +2541,29 @@ - + - + <number> - - + + + + + + - + - + @@ -1293,7 +2572,7 @@ - + @@ -1302,21 +2581,139 @@ - + - + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1325,7 +2722,7 @@ - + @@ -1334,7 +2731,7 @@ - + @@ -1343,25 +2740,29 @@ - + - + <number> - - + + + + + + - + - + @@ -1370,7 +2771,7 @@ - + @@ -1379,21 +2780,1504 @@ - + - + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <number> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1402,7 +4286,7 @@ - + @@ -1411,7 +4295,7 @@ - + @@ -1420,11 +4304,11 @@ - + - + <number> -- cgit