From 6b8ae0882bcac65f4307d6a6425f37eb0a010713 Mon Sep 17 00:00:00 2001 From: andreas kainz Date: Tue, 28 Apr 2020 13:09:44 +0200 Subject: tdf#132138 Update Focus impress template Change-Id: I4a8704b6b4dd15943357d47c71a1bedc15b98c42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93057 Tested-by: Jenkins Reviewed-by: andreas_kainz --- extras/CustomTarget_tplpresnt.mk | 4 - .../templates/presnt/Focus/META-INF/manifest.xml | 4 - .../2000000C0000634100004A4C3651558E9C43717A.svm | Bin 1227 -> 0 bytes .../2000000E0000634100004A4C2A08177FA3DF9654.svm | Bin 1619 -> 0 bytes .../2000000E0000634100004A4C8B8C0B6EC20B2683.svm | Bin 1631 -> 0 bytes .../2000000E0000634100004A4CCD2247D4D39A5527.svm | Bin 1619 -> 0 bytes .../presnt/Focus/Thumbnails/thumbnail.png | Bin 6047 -> 3022 bytes extras/source/templates/presnt/Focus/content.xml | 66 +- extras/source/templates/presnt/Focus/styles.xml | 753 ++++++++++++++------- 9 files changed, 538 insertions(+), 289 deletions(-) delete mode 100644 extras/source/templates/presnt/Focus/Pictures/2000000C0000634100004A4C3651558E9C43717A.svm delete mode 100644 extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4C2A08177FA3DF9654.svm delete mode 100644 extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4C8B8C0B6EC20B2683.svm delete mode 100644 extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4CCD2247D4D39A5527.svm (limited to 'extras') diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk index a5586aa680e9..20211dad7a20 100644 --- a/extras/CustomTarget_tplpresnt.mk +++ b/extras/CustomTarget_tplpresnt.mk @@ -84,10 +84,6 @@ extras_PRESENTATIONS_XMLFILES := \ Focus/content.xml \ Focus/META-INF/manifest.xml \ Focus/meta.xml \ - Focus/Pictures/2000000C0000634100004A4C3651558E9C43717A.svm \ - Focus/Pictures/2000000E0000634100004A4C2A08177FA3DF9654.svm \ - Focus/Pictures/2000000E0000634100004A4C8B8C0B6EC20B2683.svm \ - Focus/Pictures/2000000E0000634100004A4CCD2247D4D39A5527.svm \ Focus/styles.xml \ Focus/Thumbnails/thumbnail.png \ Forestbird/content.xml \ diff --git a/extras/source/templates/presnt/Focus/META-INF/manifest.xml b/extras/source/templates/presnt/Focus/META-INF/manifest.xml index ee978e637741..c3e1aec9147d 100644 --- a/extras/source/templates/presnt/Focus/META-INF/manifest.xml +++ b/extras/source/templates/presnt/Focus/META-INF/manifest.xml @@ -4,9 +4,5 @@ - - - - diff --git a/extras/source/templates/presnt/Focus/Pictures/2000000C0000634100004A4C3651558E9C43717A.svm b/extras/source/templates/presnt/Focus/Pictures/2000000C0000634100004A4C3651558E9C43717A.svm deleted file mode 100644 index 677189355092..000000000000 Binary files a/extras/source/templates/presnt/Focus/Pictures/2000000C0000634100004A4C3651558E9C43717A.svm and /dev/null differ diff --git a/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4C2A08177FA3DF9654.svm b/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4C2A08177FA3DF9654.svm deleted file mode 100644 index a8065f70b06a..000000000000 Binary files a/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4C2A08177FA3DF9654.svm and /dev/null differ diff --git a/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4C8B8C0B6EC20B2683.svm b/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4C8B8C0B6EC20B2683.svm deleted file mode 100644 index 2fae8bb89da7..000000000000 Binary files a/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4C8B8C0B6EC20B2683.svm and /dev/null differ diff --git a/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4CCD2247D4D39A5527.svm b/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4CCD2247D4D39A5527.svm deleted file mode 100644 index 2fc1d95dc8ca..000000000000 Binary files a/extras/source/templates/presnt/Focus/Pictures/2000000E0000634100004A4CCD2247D4D39A5527.svm and /dev/null differ diff --git a/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png b/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png index 567d1a8cf7b4..62386413514e 100644 Binary files a/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png differ diff --git a/extras/source/templates/presnt/Focus/content.xml b/extras/source/templates/presnt/Focus/content.xml index 7a2026e0b9fb..639b29ad9b25 100644 --- a/extras/source/templates/presnt/Focus/content.xml +++ b/extras/source/templates/presnt/Focus/content.xml @@ -1,5 +1,5 @@ - + @@ -20,97 +20,109 @@ - + - - + + - - + + + + + - + - + - - + + - + - + - - + + - + - + + + + + + + - + + + + - + - + - + - + - + - + - + - + - + - + diff --git a/extras/source/templates/presnt/Focus/styles.xml b/extras/source/templates/presnt/Focus/styles.xml index 3310960edc4e..88787e34ddec 100644 --- a/extras/source/templates/presnt/Focus/styles.xml +++ b/extras/source/templates/presnt/Focus/styles.xml @@ -1,11 +1,20 @@ - + + + + + + + + + + @@ -13,10 +22,10 @@ - + - + @@ -61,80 +70,128 @@ - - - - - - - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -178,46 +235,54 @@ - + - + - + + - + + - + + - + + - + + - + + - + + - + + @@ -265,7 +330,7 @@ - + @@ -313,7 +378,7 @@ - + @@ -321,15 +386,15 @@ - + - + - + @@ -373,32 +438,40 @@ - - + + - + + - + + - + + - + + - + + - + + - + + - + + @@ -446,7 +519,7 @@ - + @@ -494,7 +567,7 @@ - + @@ -502,15 +575,15 @@ - + - + - + @@ -554,35 +627,40 @@ - - + + - - + + - - + + - - + + - + + - + + - + + - + + - + + @@ -630,7 +708,7 @@ - + @@ -678,7 +756,7 @@ - + @@ -686,15 +764,15 @@ - + - + - + @@ -738,40 +816,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -819,7 +897,7 @@ - + @@ -867,7 +945,7 @@ - + @@ -891,7 +969,7 @@ - + @@ -901,129 +979,254 @@ + - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + - + + - + + + + + + + + + + + + + + + + + + + + - + + - + + + + + - + + + + + + + + + + + - + + - + + + + - + - + + - - + - - + - - + + - - - + + + - - - - + + - - + + + - - - + + - + + + - - + + - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -1119,12 +1322,6 @@ - - - - - - @@ -1156,15 +1353,38 @@ - + <number> + + + + + + - - + + + + + + + + + + + + + + + + + + + @@ -1173,33 +1393,28 @@ - + - + - + - + <number> - - - - - - + - + @@ -1207,7 +1422,7 @@ - + @@ -1216,7 +1431,7 @@ - + @@ -1225,7 +1440,7 @@ - + @@ -1234,11 +1449,11 @@ - + - + <number> @@ -1246,51 +1461,63 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + <number> + + + + + + - + @@ -1299,7 +1526,7 @@ - + @@ -1308,7 +1535,7 @@ - + @@ -1317,11 +1544,11 @@ - + - + <number> @@ -1329,41 +1556,53 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + <number> @@ -1373,7 +1612,7 @@ - + @@ -1382,7 +1621,7 @@ - + @@ -1391,7 +1630,7 @@ - + @@ -1400,11 +1639,11 @@ - + - + <number> @@ -1412,51 +1651,57 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - + - + <number> + + + + + + - + @@ -1465,7 +1710,7 @@ - + @@ -1474,7 +1719,7 @@ - + @@ -1483,11 +1728,11 @@ - + - + <number> -- cgit