extras/source/templates/presnt/Freshes/content.xml | 1
extras/source/templates/presnt/Freshes/styles.xml | 340 ++++++---------------
2 files changed, 101 insertions(+), 240 deletions(-)
New commits:
commit 752235a69024f36e28107fde1b3648fe1ea6174c
Author: Laurent Balland <laurent.ball...@mailo.fr>
AuthorDate: Sun Sep 8 17:37:38 2024 +0200
Commit: Laurent Balland <laurent.ball...@mailo.fr>
CommitDate: Sun Sep 8 19:19:53 2024 +0200
Update Freshes Impress template
- correct position for Footer and Page in Notes view
- set black font color for all elements of Notes and Handout
- simplify Header/Footer/Date/Page elements
Change-Id: I973f6a770fa1b4ac0a22375cff8ae1a5e440ae0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173046
Tested-by: Jenkins
Reviewed-by: Laurent Balland <laurent.ball...@mailo.fr>
diff --git a/extras/source/templates/presnt/Freshes/content.xml
b/extras/source/templates/presnt/Freshes/content.xml
index b90d7fcf65fc..a8368dffbd6d 100644
--- a/extras/source/templates/presnt/Freshes/content.xml
+++ b/extras/source/templates/presnt/Freshes/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:transition-speed="fast"
presentation:background-visible="true"
presentation:background-objects-visible="true"
presentation:display-footer="true" presentation:display-page-number="false"
presentation:display-date-time="true" smil:type="fade" smil:subtype="crossfade"
smil:fadeColor="#000000"/>
diff --git a/extras/source/templates/presnt/Freshes/styles.xml
b/extras/source/templates/presnt/Freshes/styles.xml
index 4db57b54ecb8..bc4cf53fb13b 100644
--- a/extras/source/templates/presnt/Freshes/styles.xml
+++ b/extras/source/templates/presnt/Freshes/styles.xml
@@ -68,7 +68,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:graphic-properties draw:fill="none"/>
@@ -192,7 +192,7 @@
<style:text-properties style:letter-kerning="true"/>
</style:style>
<style:style style:name="Freshes-backgroundobjects"
style:family="presentation">
- <style:graphic-properties draw:fill="none" draw:fill-color="#0d84a1"
draw:textarea-horizontal-align="justify" draw:shadow="hidden"
draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm"
draw:shadow-color="#808080"/>
+ <style:graphic-properties draw:stroke="none" draw:fill="none"
draw:fill-color="#0d84a1" draw:textarea-horizontal-align="justify"
draw:shadow="hidden" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm"
draw:shadow-color="#808080"/>
<style:paragraph-properties style:writing-mode="page"/>
</style:style>
<style:style style:name="Freshes-notes" style:family="presentation">
@@ -2264,12 +2264,12 @@
</style:style>
<style:style style:name="MP2" style:family="paragraph">
<loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/>
- <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt"
style:font-size-complex="14pt"/>
+ <style:text-properties style:use-window-font-color="false"
fo:color="#000000" loext:opacity="100%" fo:font-size="14pt"
style:font-size-asian="14pt" style:font-size-complex="14pt"/>
</style:style>
<style:style style:name="MP4" style:family="paragraph">
<loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/>
<style:paragraph-properties fo:text-align="right"/>
- <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt"
style:font-size-complex="14pt"/>
+ <style:text-properties style:use-window-font-color="false"
fo:color="#000000" loext:opacity="100%" fo:font-size="14pt"
style:font-size-asian="14pt" style:font-size-complex="14pt"/>
</style:style>
<style:style style:name="MP9" style:family="paragraph">
<loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/>
@@ -2292,36 +2292,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="26.543cm" presentation:class="footer">
+ <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="26.543cm" presentation:class="page-number">
+ <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>
@@ -2352,36 +2344,28 @@
<draw:frame presentation:style-name="Freshes-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="Freshes-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="26.543cm" presentation:class="footer">
+ <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="26.543cm" presentation:class="page-number">
+ <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>
@@ -2401,7 +2385,7 @@
<draw:frame presentation:style-name="One_20_Bullet-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>
+ <text:span text:style-name="MT1">
<presentation:date-time/>
</text:span>
</text:p>
@@ -2410,16 +2394,14 @@
<draw:frame presentation:style-name="One_20_Bullet-backgroundobjects"
draw:text-style-name="MP9" 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="One_20_Bullet-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:span text:style-name="MT1">
<text:page-number/>
</text:span>
</text:p>
@@ -2434,36 +2416,28 @@
<draw:frame presentation:style-name="One_20_Bullet-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="One_20_Bullet-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="26.543cm" presentation:class="footer">
+ <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="26.543cm" presentation:class="page-number">
+ <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>
@@ -2492,18 +2466,14 @@
<draw:frame presentation:style-name="Two_20_Bullets-backgroundobjects"
draw:text-style-name="MP9" 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="Two_20_Bullets-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>
@@ -2516,36 +2486,28 @@
<draw:frame presentation:style-name="Two_20_Bullets-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="Two_20_Bullets-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="Mpr9" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="26.543cm" presentation:class="footer">
+ <draw:frame presentation:style-name="Mpr9" 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="Mpr9" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="26.543cm" presentation:class="page-number">
+ <draw:frame presentation:style-name="Mpr9" 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>
@@ -2565,27 +2527,21 @@
<draw:frame presentation:style-name="Three_20_Bullets-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="Three_20_Bullets-backgroundobjects"
draw:text-style-name="MP9" 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="Three_20_Bullets-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>
@@ -2598,36 +2554,28 @@
<draw:frame
presentation:style-name="Three_20_Bullets-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="Three_20_Bullets-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="26.543cm" presentation:class="footer">
+ <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="26.543cm" presentation:class="page-number">
+ <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>
@@ -2650,27 +2598,21 @@
<draw:frame presentation:style-name="Four_20_Bullets-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="Four_20_Bullets-backgroundobjects"
draw:text-style-name="MP9" 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="Four_20_Bullets-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>
@@ -2683,36 +2625,28 @@
<draw:frame
presentation:style-name="Four_20_Bullets-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="Four_20_Bullets-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="Mpr15" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="26.543cm" presentation:class="footer">
+ <draw:frame presentation:style-name="Mpr15" 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="Mpr15" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="26.543cm" presentation:class="page-number">
+ <draw:frame presentation:style-name="Mpr15" 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>
@@ -2732,7 +2666,7 @@
<draw:frame
presentation:style-name="Blue_2f_White_20_Chart-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>
+ <text:span text:style-name="MT1">
<presentation:date-time/>
</text:span>
</text:p>
@@ -2741,16 +2675,14 @@
<draw:frame
presentation:style-name="Blue_2f_White_20_Chart-backgroundobjects"
draw:text-style-name="MP9" 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="Blue_2f_White_20_Chart-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:span text:style-name="MT1">
<text:page-number/>
</text:span>
</text:p>
@@ -2765,36 +2697,28 @@
<draw:frame
presentation:style-name="Blue_2f_White_20_Chart-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="Blue_2f_White_20_Chart-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="26.543cm" presentation:class="footer">
+ <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="26.543cm" presentation:class="page-number">
+ <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>
@@ -2814,27 +2738,21 @@
<draw:frame
presentation:style-name="White_2f_Blue_20_Chart-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="White_2f_Blue_20_Chart-backgroundobjects"
draw:text-style-name="MP9" 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="White_2f_Blue_20_Chart-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>
@@ -2847,36 +2765,28 @@
<draw:frame
presentation:style-name="White_2f_Blue_20_Chart-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="White_2f_Blue_20_Chart-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="26.543cm" presentation:class="footer">
+ <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="26.543cm" presentation:class="page-number">
+ <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>
@@ -2895,18 +2805,14 @@
<draw:frame presentation:style-name="Diagram-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="Diagram-backgroundobjects"
draw:text-style-name="MP9" 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>
@@ -2928,36 +2834,28 @@
<draw:frame presentation:style-name="Diagram-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="Diagram-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="Mpr30" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="26.543cm" presentation:class="footer">
+ <draw:frame presentation:style-name="Mpr30" 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="Mpr30" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="26.543cm" presentation:class="page-number">
+ <draw:frame presentation:style-name="Mpr30" 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>
@@ -2976,18 +2874,14 @@
<draw:frame presentation:style-name="Table-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="Table-backgroundobjects"
draw:text-style-name="MP9" 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>
@@ -3009,36 +2903,28 @@
<draw:frame presentation:style-name="Table-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="Table-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="Mpr21" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="26.543cm" presentation:class="footer">
+ <draw:frame presentation:style-name="Mpr21" 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="Mpr21" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="26.543cm" presentation:class="page-number">
+ <draw:frame presentation:style-name="Mpr21" 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>
@@ -3067,18 +2953,14 @@
<draw:frame presentation:style-name="Left_20_Bar-backgroundobjects"
draw:text-style-name="MP9" 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-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>
@@ -3091,36 +2973,28 @@
<draw:frame presentation:style-name="Left_20_Bar-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-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="Mpr33" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="26.543cm" presentation:class="footer">
+ <draw:frame presentation:style-name="Mpr33" 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="Mpr33" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="26.543cm" presentation:class="page-number">
+ <draw:frame presentation:style-name="Mpr33" 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>
@@ -3140,18 +3014,14 @@
<draw:frame presentation:style-name="Right_20_Bar-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-backgroundobjects"
draw:text-style-name="MP9" 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>
@@ -3173,36 +3043,28 @@
<draw:frame presentation:style-name="Right_20_Bar-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-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="Mpr27" draw:text-style-name="MP2"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="0cm" svg:y="26.543cm" presentation:class="footer">
+ <draw:frame presentation:style-name="Mpr27" 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="Mpr27" draw:text-style-name="MP4"
draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm"
svg:x="11.886cm" svg:y="26.543cm" presentation:class="page-number">
+ <draw:frame presentation:style-name="Mpr27" 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>
