extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
| 2
extras/source/templates/presnt/Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg
| 81 --
extras/source/templates/presnt/Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg
| 85 ---
extras/source/templates/presnt/Growing_Liberty/content.xml
| 1
extras/source/templates/presnt/Growing_Liberty/styles.xml
| 274 ++--------
extras/template_files.mk
| 2
6 files changed, 71 insertions(+), 374 deletions(-)
New commits:
commit 53537bc41584dbad3bf75d33abf122d75140605d
Author: Laurent Balland <[email protected]>
AuthorDate: Sun Sep 8 18:41:04 2024 +0200
Commit: Laurent Balland <[email protected]>
CommitDate: Wed Sep 11 20:41:21 2024 +0200
Update Growing Liberty Impress template
- remove duplicate picture (add a rotation)
- simplify Header/Footer/Date/Page elements in Handout, Notes and Master
slides
Change-Id: I933294fce99614448317ef572552f57bb585bc9d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173047
Tested-by: Jenkins
Reviewed-by: Laurent Balland <[email protected]>
diff --git
a/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
b/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
index d8258cce4bc3..ef6e126a9627 100644
--- a/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/META-INF/manifest.xml
@@ -9,8 +9,6 @@
<manifest:file-entry
manifest:full-path="Pictures/10000201000001F3000003548E51808DE171DA02.png"
manifest:media-type="image/png"/>
<manifest:file-entry
manifest:full-path="Pictures/10000C8F0000034200004A6ABD021DA9BD39254C.svg"
manifest:media-type="image/svg+xml"/>
<manifest:file-entry
manifest:full-path="Pictures/10000C1C0000034200004A6A2C92F38BC117DD3C.svg"
manifest:media-type="image/svg+xml"/>
- <manifest:file-entry
manifest:full-path="Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg"
manifest:media-type="image/svg+xml"/>
- <manifest:file-entry
manifest:full-path="Pictures/10000C340000844B000003422549B923A55839CC.svg"
manifest:media-type="image/svg+xml"/>
<manifest:file-entry
manifest:full-path="Pictures/10000201000001F000000351DA39462E363D7ED3.png"
manifest:media-type="image/png"/>
<manifest:file-entry
manifest:full-path="Pictures/100002010000016A0000029374C9F2B8F26392AD.png"
manifest:media-type="image/png"/>
<manifest:file-entry manifest:full-path="content.xml"
manifest:media-type="text/xml"/>
diff --git
a/extras/source/templates/presnt/Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg
b/extras/source/templates/presnt/Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg
deleted file mode 100644
index 2192657d542d..000000000000
---
a/extras/source/templates/presnt/Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="1280"
- height="31.529394"
- id="svg15942"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="New document 155">
- <defs
- id="defs15944" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.35"
- inkscape:cx="637.85748"
- inkscape:cy="30.050411"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="463"
- inkscape:window-height="423"
- inkscape:window-x="104"
- inkscape:window-y="104"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata15947">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(262.85748,-530.8832)">
- <g
- transform="matrix(0,1,-1.7777778,0,14952.366,-95.018866)"
- id="g15763-2">
- <path
- inkscape:connector-curvature="0"
-
style="color:#000000;fill:#83e973;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m 657.43146,8304.7819 -10.16973,17.8867 c -2.05442,80.3537
-3.2169,168.8308 -10.01777,235.8945 l 20.1875,0 0,-240 z"
- id="path15736-5"
- sodipodi:nodetypes="cccccc" />
- <path
- inkscape:connector-curvature="0"
-
style="color:#000000;fill:#cee8f7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m 627.43146,7838.5631 c -6.28063,62.7189 8.45111,175.1677
14.0625,253.8126 l 15.9375,-27.5938 0,-226.2188 -30,0 z"
- id="path15738-3" />
- <path
-
style="color:#000000;fill:#67c4b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m 647.26393,8322.6669 10.16719,-17.8931 0,-240 -15.93496,27.6002 c
5.84029,75.3486 7.79128,164.9937 5.76777,230.2929 z"
- id="path15740-4"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
- </g>
- </g>
-</svg>
diff --git
a/extras/source/templates/presnt/Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg
b/extras/source/templates/presnt/Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg
deleted file mode 100644
index c412583b633d..000000000000
---
a/extras/source/templates/presnt/Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="1280"
- height="31.529394"
- id="svg15905"
- version="1.1"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="New document 153">
- <defs
- id="defs15907" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="0.35"
- inkscape:cx="852.14277"
- inkscape:cy="121.47898"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="463"
- inkscape:window-height="423"
- inkscape:window-x="717"
- inkscape:window-y="168"
- inkscape:window-maximized="0" />
- <metadata
- id="metadata15910">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- <dc:title></dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(477.14277,-622.31177)">
- <g
- id="g15710-2"
- transform="matrix(0,1,-1.7777778,0,14728.024,-27.752585)">
- <g
- transform="translate(134,0)"
- id="g15665-6">
- <path
- inkscape:connector-curvature="0"
-
style="color:#000000;fill:#2493d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m 547.59375,8299.125 -10.16973,17.8867 c -2.05442,80.3537
-3.2169,168.8308 -10.01777,235.8945 l 20.1875,0 0,-240 z"
- id="rect8704-7-1"
- sodipodi:nodetypes="cccccc" />
- <path
- inkscape:connector-curvature="0"
-
style="color:#000000;fill:#6ad15a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m 517.59375,7832.9062 c -6.28063,62.7189 8.45111,175.1677
14.0625,253.8126 l 15.9375,-27.5938 0,-226.2188 -30,0 z"
- id="rect8706-7-7" />
- <path
-
style="color:#000000;fill:#67c4b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
- d="m 537.42622,8317.01 10.16719,-17.8931 0,-240 -15.93496,27.6002 c
5.84029,75.3486 7.79128,164.9937 5.76777,230.2929 z"
- id="rect8708-9-6"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccc" />
- </g>
- </g>
- </g>
-</svg>
diff --git a/extras/source/templates/presnt/Growing_Liberty/content.xml
b/extras/source/templates/presnt/Growing_Liberty/content.xml
index d81aa26bd2ee..d1753e65d026 100644
--- a/extras/source/templates/presnt/Growing_Liberty/content.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/content.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<office:document-content xmlns:officeooo="http://openoffice.org/2009/office";
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
xmlns:css3t="http://www.w3.org/TR/css3-text/";
xmlns:grddl="http://www.w3.org/2003/g/data-view#";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:style="urn:oasis:names:tc:opendocument:
xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:xsd="ht
tp://www.w3.org/2001/XMLSchema"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:xforms="http://www.w3.org/2002/xforms"; office:version="1.3">
- <office:scripts/>
<office:automatic-styles>
<style:style style:name="dp1" style:family="drawing-page">
<style:drawing-page-properties presentation:background-visible="true"
presentation:background-objects-visible="true"
presentation:display-footer="false" presentation:display-page-number="false"
presentation:display-date-time="false"/>
diff --git a/extras/source/templates/presnt/Growing_Liberty/styles.xml
b/extras/source/templates/presnt/Growing_Liberty/styles.xml
index 590d21020e8d..4adc75f575e0 100644
--- a/extras/source/templates/presnt/Growing_Liberty/styles.xml
+++ b/extras/source/templates/presnt/Growing_Liberty/styles.xml
@@ -76,7 +76,7 @@
</text:list-style>
</style:graphic-properties>
<style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0cm" fo:margin-bottom="0cm" fo:line-height="100%"
fo:text-indent="0cm"/>
- <style:text-properties fo:font-variant="normal" fo:text-transform="none"
style:use-window-font-color="true" loext:opacity="0%"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Noto Sans"
fo:font-size="18pt" fo:font-style="normal" fo:text-shadow="none"
style:text-underline-style="none" fo:font-weight="normal"
style:letter-kerning="true" style:font-name-asian="Noto Sans CJK SC"
style:font-size-asian="18pt" style:font-style-asian="normal"
style:font-weight-asian="normal" style:font-name-complex="Noto Sans Devanagari"
style:font-size-complex="18pt" style:font-style-complex="normal"
style:font-weight-complex="normal" style:text-emphasize="none"
style:font-relief="none" style:text-overline-style="none"
style:text-overline-color="font-color"/>
+ <style:text-properties fo:font-variant="normal" fo:text-transform="none"
style:use-window-font-color="true" loext:opacity="0%"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" fo:font-size="18pt" fo:font-style="normal"
fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal"
style:letter-kerning="true" style:font-size-asian="18pt"
style:font-style-asian="normal" style:font-weight-asian="normal"
style:font-size-complex="18pt" style:font-style-complex="normal"
style:font-weight-complex="normal" style:text-emphasize="none"
style:font-relief="none" style:text-overline-style="none"
style:text-overline-color="font-color"/>
</style:style>
<style:style style:name="objectwithoutfill" style:family="graphic"
style:parent-style-name="standard"/>
<style:style
style:name="Object_20_with_20_no_20_fill_20_and_20_no_20_line"
style:display-name="Object with no fill and no line" style:family="graphic"
style:parent-style-name="standard">
@@ -2471,36 +2471,28 @@
<draw:frame draw:style-name="Mgr1" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame draw:style-name="Mgr1" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="0cm" presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame draw:style-name="Mgr2" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame draw:style-name="Mgr2" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2525,36 +2517,28 @@
<draw:frame presentation:style-name="Title_20_Slide-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Title_20_Slide-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr22" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr22" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2574,27 +2558,21 @@
<draw:frame
presentation:style-name="Right_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="1.4cm" svg:y="14.8cm" presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Right_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP5" draw:layer="backgroundobjects" svg:width="9cm"
svg:height="0.6cm" svg:x="9.5cm" svg:y="14.8cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Right_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="20.08cm" svg:y="14.8cm"
presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2606,36 +2584,28 @@
<draw:frame
presentation:style-name="Right_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Right_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr2" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr2" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2655,27 +2625,21 @@
<draw:frame
presentation:style-name="Left_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="1.4cm" svg:y="14.8cm" presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Left_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP5" draw:layer="backgroundobjects" svg:width="9cm"
svg:height="0.6cm" svg:x="9.5cm" svg:y="14.8cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Left_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="20.08cm" svg:y="14.8cm"
presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2687,36 +2651,28 @@
<draw:frame
presentation:style-name="Left_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Left_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr4" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr4" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2724,8 +2680,8 @@
</style:master-page>
<style:master-page style:name="Bottom_20_Bar_20_White"
style:display-name="Bottom Bar White" style:page-layout-name="PM1"
draw:style-name="Mdp1">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:frame draw:style-name="Mgr3" draw:layer="backgroundobjects"
svg:width="28cm" svg:height="0.7cm" svg:x="0cm" svg:y="15.05cm">
- <draw:image
xlink:href="Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg"
xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
draw:mime-type="image/svg+xml"/>
+ <draw:frame draw:style-name="Mgr3" draw:layer="backgroundobjects"
svg:width="0.7cm" svg:height="28cm" draw:transform="rotate (-1.5707963267949)
translate (28cm 15.05cm)">
+ <draw:image
xlink:href="Pictures/10000C8F0000034200004A6ABD021DA9BD39254C.svg"
xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
draw:mime-type="image/svg+xml"/>
</draw:frame>
<draw:frame presentation:style-name="Bottom_20_Bar_20_White-title"
draw:layer="backgroundobjects" svg:width="25.2cm" svg:height="2.5cm"
svg:x="1.4cm" svg:y="1cm" presentation:class="title"
presentation:placeholder="true">
<draw:text-box/>
@@ -2736,27 +2692,21 @@
<draw:frame
presentation:style-name="Bottom_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="1.4cm" svg:y="14.8cm" presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Bottom_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP5" draw:layer="backgroundobjects" svg:width="9cm"
svg:height="0.6cm" svg:x="9.5cm" svg:y="14.8cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Bottom_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="20.08cm" svg:y="14.8cm"
presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2768,36 +2718,28 @@
<draw:frame
presentation:style-name="Bottom_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Bottom_20_Bar_20_White-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr6" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr6" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2805,8 +2747,8 @@
</style:master-page>
<style:master-page style:name="Bottom_20_Bar_20_Blue"
style:display-name="Bottom Bar Blue" style:page-layout-name="PM1"
draw:style-name="Mdp2">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:frame draw:style-name="Mgr3" draw:layer="backgroundobjects"
svg:width="28cm" svg:height="0.7cm" svg:x="0cm" svg:y="15.05cm">
- <draw:image
xlink:href="Pictures/10000C340000844B000003422549B923A55839CC.svg"
xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
draw:mime-type="image/svg+xml"/>
+ <draw:frame draw:style-name="Mgr3" draw:layer="backgroundobjects"
svg:width="0.7cm" svg:height="28cm" draw:transform="rotate (-1.5707963267949)
translate (28cm 15.05cm)">
+ <draw:image
xlink:href="Pictures/10000C1C0000034200004A6A2C92F38BC117DD3C.svg"
xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"
draw:mime-type="image/svg+xml"/>
</draw:frame>
<draw:frame presentation:style-name="Bottom_20_Bar_20_Blue-title"
draw:layer="backgroundobjects" svg:width="25.2cm" svg:height="2.5cm"
svg:x="1.4cm" svg:y="1cm" presentation:class="title"
presentation:placeholder="true">
<draw:text-box/>
@@ -2849,36 +2791,28 @@
<draw:frame
presentation:style-name="Bottom_20_Bar_20_Blue-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Bottom_20_Bar_20_Blue-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr8" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr8" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2901,27 +2835,21 @@
<draw:frame
presentation:style-name="Leaf_20_White_20_1-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="1.4cm" svg:y="14.8cm" presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Leaf_20_White_20_1-backgroundobjects"
draw:text-style-name="MP5" draw:layer="backgroundobjects" svg:width="9cm"
svg:height="0.6cm" svg:x="9.5cm" svg:y="14.8cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Leaf_20_White_20_1-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="20.08cm" svg:y="14.8cm"
presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2933,36 +2861,28 @@
<draw:frame
presentation:style-name="Leaf_20_White_20_1-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Leaf_20_White_20_1-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr10" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr10" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -2987,18 +2907,14 @@
<draw:frame
presentation:style-name="Leaf_20_White_20_2-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="6.52cm"
svg:height="0.6cm" svg:x="1.4cm" svg:y="14.8cm" presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Leaf_20_White_20_2-backgroundobjects"
draw:text-style-name="MP5" draw:layer="backgroundobjects" svg:width="9cm"
svg:height="0.6cm" svg:x="9.5cm" svg:y="14.8cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -3019,36 +2935,28 @@
<draw:frame
presentation:style-name="Leaf_20_White_20_2-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Leaf_20_White_20_2-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr12" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr12" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -3100,36 +3008,28 @@
<draw:frame
presentation:style-name="Right_20_Bar_20_Blue-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Right_20_Bar_20_Blue-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr14" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr14" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -3181,36 +3081,28 @@
<draw:frame
presentation:style-name="Left_20_Bar_20_Blue-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Left_20_Bar_20_Blue-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr16" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr16" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -3265,36 +3157,28 @@
<draw:frame
presentation:style-name="Leaf_20_Blue_20_1-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Leaf_20_Blue_20_1-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr18" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr18" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -3349,36 +3233,28 @@
<draw:frame
presentation:style-name="Leaf_20_Blue_20_1-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame
presentation:style-name="Leaf_20_Blue_20_1-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr20" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr20" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
@@ -3428,36 +3304,28 @@
<draw:frame presentation:style-name="End_20_Slide-backgroundobjects"
draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:header/>
- </text:span>
+ <presentation:header/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="End_20_Slide-backgroundobjects"
draw:text-style-name="MP4" draw:layer="backgroundobjects" svg:width="9.113cm"
svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm"
presentation:class="date-time">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:date-time/>
- </text:span>
+ <presentation:date-time/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr24" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
<draw:text-box>
<text:p>
- <text:span>
- <presentation:footer/>
- </text:span>
+ <presentation:footer/>
</text:p>
</draw:text-box>
</draw:frame>
<draw:frame presentation:style-name="Mpr24" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
<draw:text-box>
<text:p>
- <text:span>
- <text:page-number/>
- </text:span>
+ <text:page-number/>
</text:p>
</draw:text-box>
</draw:frame>
diff --git a/extras/template_files.mk b/extras/template_files.mk
index 8587d74a1dbb..75dbefba2f25 100644
--- a/extras/template_files.mk
+++ b/extras/template_files.mk
@@ -84,9 +84,7 @@ extra_files_PRESENTATIONS := \
presnt/Growing_Liberty/Pictures/10000201000001F10000029333ED1BC48076B5C4.png \
presnt/Growing_Liberty/Pictures/10000201000001F3000003548E51808DE171DA02.png \
presnt/Growing_Liberty/Pictures/10000C1C0000034200004A6A2C92F38BC117DD3C.svg \
-
presnt/Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg \
presnt/Growing_Liberty/Pictures/10000C8F0000034200004A6ABD021DA9BD39254C.svg \
-
presnt/Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg \
presnt/Growing_Liberty/Thumbnails/thumbnail.png \
presnt/Inspiration/Thumbnails/thumbnail.png \
presnt/Lights/Thumbnails/thumbnail.png \
