From 777f53503121e21ea6a584d0578b3e3eee2ed3fa Mon Sep 17 00:00:00 2001 From: andreas kainz Date: Wed, 29 Apr 2020 13:15:57 +0200 Subject: tdf#132138 Update Vivid impress template Change-Id: Id35a95abe8fd38a4ac284de384c01a7e3a528c81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93146 Tested-by: Jenkins Reviewed-by: andreas_kainz --- extras/CustomTarget_tplpresnt.mk | 4 - .../templates/presnt/Vivid/META-INF/manifest.xml | 4 - .../1000000000000020000000204B249CA79A42C6D7.png | Bin 859 -> 0 bytes .../10000000000004F900000322783ADE15FCCE3CBA.png | Bin 31541 -> 0 bytes .../10000000000004F900000322B6E66A5FF68F74A7.png | Bin 32672 -> 0 bytes .../10000000000005550000035C66CD1AA3E88406D5.png | Bin 59525 -> 0 bytes extras/source/templates/presnt/Vivid/content.xml | 70 +-- extras/source/templates/presnt/Vivid/styles.xml | 537 +++++++++++++-------- 8 files changed, 381 insertions(+), 234 deletions(-) delete mode 100644 extras/source/templates/presnt/Vivid/Pictures/1000000000000020000000204B249CA79A42C6D7.png delete mode 100644 extras/source/templates/presnt/Vivid/Pictures/10000000000004F900000322783ADE15FCCE3CBA.png delete mode 100644 extras/source/templates/presnt/Vivid/Pictures/10000000000004F900000322B6E66A5FF68F74A7.png delete mode 100644 extras/source/templates/presnt/Vivid/Pictures/10000000000005550000035C66CD1AA3E88406D5.png (limited to 'extras') diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk index ed99dcd5bb46..917763f59146 100644 --- a/extras/CustomTarget_tplpresnt.mk +++ b/extras/CustomTarget_tplpresnt.mk @@ -184,10 +184,6 @@ extras_PRESENTATIONS_XMLFILES := \ Vivid/content.xml \ Vivid/META-INF/manifest.xml \ Vivid/meta.xml \ - Vivid/Pictures/1000000000000020000000204B249CA79A42C6D7.png \ - Vivid/Pictures/10000000000004F900000322783ADE15FCCE3CBA.png \ - Vivid/Pictures/10000000000004F900000322B6E66A5FF68F74A7.png \ - Vivid/Pictures/10000000000005550000035C66CD1AA3E88406D5.png \ Vivid/styles.xml \ Vivid/Thumbnails/thumbnail.png \ diff --git a/extras/source/templates/presnt/Vivid/META-INF/manifest.xml b/extras/source/templates/presnt/Vivid/META-INF/manifest.xml index e547f53abe9e..c3e1aec9147d 100644 --- a/extras/source/templates/presnt/Vivid/META-INF/manifest.xml +++ b/extras/source/templates/presnt/Vivid/META-INF/manifest.xml @@ -4,9 +4,5 @@ - - - - diff --git a/extras/source/templates/presnt/Vivid/Pictures/1000000000000020000000204B249CA79A42C6D7.png b/extras/source/templates/presnt/Vivid/Pictures/1000000000000020000000204B249CA79A42C6D7.png deleted file mode 100644 index 45b401dc6037..000000000000 Binary files a/extras/source/templates/presnt/Vivid/Pictures/1000000000000020000000204B249CA79A42C6D7.png and /dev/null differ diff --git a/extras/source/templates/presnt/Vivid/Pictures/10000000000004F900000322783ADE15FCCE3CBA.png b/extras/source/templates/presnt/Vivid/Pictures/10000000000004F900000322783ADE15FCCE3CBA.png deleted file mode 100644 index dc4b005c6540..000000000000 Binary files a/extras/source/templates/presnt/Vivid/Pictures/10000000000004F900000322783ADE15FCCE3CBA.png and /dev/null differ diff --git a/extras/source/templates/presnt/Vivid/Pictures/10000000000004F900000322B6E66A5FF68F74A7.png b/extras/source/templates/presnt/Vivid/Pictures/10000000000004F900000322B6E66A5FF68F74A7.png deleted file mode 100644 index 68d81d8e7df6..000000000000 Binary files a/extras/source/templates/presnt/Vivid/Pictures/10000000000004F900000322B6E66A5FF68F74A7.png and /dev/null differ diff --git a/extras/source/templates/presnt/Vivid/Pictures/10000000000005550000035C66CD1AA3E88406D5.png b/extras/source/templates/presnt/Vivid/Pictures/10000000000005550000035C66CD1AA3E88406D5.png deleted file mode 100644 index 80d1d0b55893..000000000000 Binary files a/extras/source/templates/presnt/Vivid/Pictures/10000000000005550000035C66CD1AA3E88406D5.png and /dev/null differ diff --git a/extras/source/templates/presnt/Vivid/content.xml b/extras/source/templates/presnt/Vivid/content.xml index 262fb7b8e3be..8d0758e2d560 100644 --- a/extras/source/templates/presnt/Vivid/content.xml +++ b/extras/source/templates/presnt/Vivid/content.xml @@ -1,5 +1,5 @@ - + @@ -9,13 +9,13 @@ - + - + @@ -27,37 +27,46 @@ - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + - + - + + @@ -65,45 +74,42 @@ - + - + - - + - + - + - + - - + - + - + - - + diff --git a/extras/source/templates/presnt/Vivid/styles.xml b/extras/source/templates/presnt/Vivid/styles.xml index a89ca3d03b69..1419f7b50420 100644 --- a/extras/source/templates/presnt/Vivid/styles.xml +++ b/extras/source/templates/presnt/Vivid/styles.xml @@ -1,5 +1,5 @@ - + @@ -7,26 +7,26 @@ - - - - - - - - - + + + + + + + + + - + - + - + @@ -71,81 +71,128 @@ - - - - - - - + - + - + - - - + + + - - - - + + + - - - + + + - - - + + + - - - - + + - - - - + + + - - - - + + + - - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + - + - + - + - + @@ -189,43 +236,43 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -272,10 +319,10 @@ - + - + @@ -322,100 +369,100 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -463,10 +510,10 @@ - + - + @@ -513,23 +560,23 @@ - + - + - + - + - + @@ -573,40 +620,40 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -654,10 +701,10 @@ - + - + @@ -704,7 +751,7 @@ - + @@ -728,77 +775,109 @@ - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + + + + + + + + + + @@ -896,13 +975,16 @@ - + + + + @@ -912,6 +994,9 @@ + + + @@ -921,6 +1006,9 @@ + + + @@ -928,42 +1016,51 @@ - + <Foliennummer> + + + - - - + + + - - + + + + + - + + - + - + + - + - - + + <Foliennummer> + - + - + @@ -977,6 +1074,9 @@ + + + @@ -986,6 +1086,9 @@ + + + @@ -995,6 +1098,9 @@ + + + @@ -1002,7 +1108,10 @@ - + <Foliennummer> + + + @@ -1010,31 +1119,37 @@ - - + + + + + - + - + - + + - + - + + - + - - + + <Foliennummer> + @@ -1049,6 +1164,9 @@ + + + @@ -1058,6 +1176,9 @@ + + + @@ -1067,6 +1188,9 @@ + + + @@ -1074,42 +1198,55 @@ - + <Foliennummer> + + + - - - + + + + + + - + - + - + + - + - + + - + - - + + <Foliennummer> + + + + + @@ -1121,6 +1258,9 @@ + + + @@ -1130,6 +1270,9 @@ + + + @@ -1139,6 +1282,9 @@ + + + @@ -1146,7 +1292,10 @@ - + <Foliennummer> + + + -- cgit