[Libreoffice-commits] core.git: 2 commits - extras/source

Laurent BP (via logerrit) logerrit at kemper.freedesktop.org
Sun May 10 14:01:11 UTC 2020


 extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/BrightBlue/styles.xml               |   53 +--
 extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png      |binary
 extras/source/templates/presnt/Focus/content.xml                   |    2 
 extras/source/templates/presnt/Focus/styles.xml                    |  166 +++-------
 5 files changed, 78 insertions(+), 143 deletions(-)

New commits:
commit 4344cbeec7a4215e62ca553f260967a5732e7081
Author:     Laurent BP <laurent.balland-poirier at laposte.net>
AuthorDate: Fri May 8 15:57:52 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun May 10 16:00:49 2020 +0200

    tdf#132771 Update BrightBlue Impress template
    
    * Update preview with Lorem 16:9
    * remove language and country tags in styles.xml
    * add Asian and complex tags in styles.xml
    * remove useless text page number in German in styles.xml
    
    Change-Id: Iea9cbd8f47c802a8cc3ef2b012bad3bc6ef56a95
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93745
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png b/extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png
index 3927b487f9fe..77227e431f73 100644
Binary files a/extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/BrightBlue/styles.xml b/extras/source/templates/presnt/BrightBlue/styles.xml
index ea392cba27b5..4fe58893079f 100644
--- a/extras/source/templates/presnt/BrightBlue/styles.xml
+++ b/extras/source/templates/presnt/BrightBlue/styles.xml
@@ -17,7 +17,7 @@
       <style:paragraph-properties style:text-autospace="ideograph-alpha" style:punctuation-wrap="simple" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
         <style:tab-stops/>
       </style:paragraph-properties>
-      <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Liberation Sans" fo:font-size="24pt" fo:language="de" fo:country="AT" style:font-name-asian="Segoe UI" style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Tahoma" style:font-size-complex="24pt" style:language-complex="hi" style:country-complex="IN"/>
+      <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Liberation Sans" fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
     </style:default-style>
     <style:style style:name="standard" style:family="graphic">
       <style:graphic-properties draw:stroke="solid" draw:stroke-dash="Dashed_20__28_var_29__20_2" svg:stroke-width="0.05cm" svg:stroke-color="#dee6ef" draw:marker-start-width="0.29cm" draw:marker-start-center="false" draw:marker-end-width="0.29cm" draw:marker-end-center="false" draw:fill="solid" draw:fill-color="#3465a4" draw:textarea-horizontal-align="justify" draw:auto-grow-height="false" fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm" fo:wrap-option="wrap" draw:shadow="visible" draw:shadow-offset-x="0.07cm" draw:shadow-offset-y="0.07cm" draw:shadow-color="#3465a4" draw:start-line-spacing-horizontal="0.25cm" draw:start-line-spacing-vertical="0.25cm" draw:end-line-spacing-horizontal="0.25cm" draw:end-line-spacing-vertical="0.25cm">
@@ -81,41 +81,41 @@
     </style:style>
     <style:style style:name="A4" style:family="graphic" style:parent-style-name="Text">
       <style:graphic-properties draw:fill="none"/>
-      <style:text-properties fo:font-size="18pt"/>
+      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
     <style:style style:name="Title_20_A4" style:display-name="Title A4" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
-      <style:text-properties fo:font-size="44pt"/>
+      <style:text-properties fo:font-size="44pt" style:font-size-asian="44pt" style:font-size-complex="44pt"/>
     </style:style>
     <style:style style:name="Heading_20_A4" style:display-name="Heading A4" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
-      <style:text-properties fo:font-size="24pt"/>
+      <style:text-properties fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
     </style:style>
     <style:style style:name="Text_20_A4" style:display-name="Text A4" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
     </style:style>
     <style:style style:name="A4" style:family="graphic" style:parent-style-name="Text">
       <style:graphic-properties draw:fill="none"/>
-      <style:text-properties fo:font-size="18pt"/>
+      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
     <style:style style:name="Title_20_A0" style:display-name="Title A0" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
-      <style:text-properties fo:font-size="96pt"/>
+      <style:text-properties fo:font-size="96pt" style:font-size-asian="96pt" style:font-size-complex="96pt"/>
     </style:style>
     <style:style style:name="Heading_20_A0" style:display-name="Heading A0" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
-      <style:text-properties fo:font-size="72pt"/>
+      <style:text-properties fo:font-size="72pt" style:font-size-asian="72pt" style:font-size-complex="72pt"/>
     </style:style>
     <style:style style:name="Text_20_A0" style:display-name="Text A0" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
     </style:style>
     <style:style style:name="Graphic" style:family="graphic">
       <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
-      <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="18pt"/>
+      <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
     <style:style style:name="Shapes" style:family="graphic" style:parent-style-name="Graphic">
       <style:graphic-properties draw:stroke="none" draw:fill="gradient" draw:fill-gradient-name="Shapes"/>
-      <style:text-properties fo:font-size="14pt" fo:font-weight="bold"/>
+      <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
     </style:style>
     <style:style style:name="Filled" style:family="graphic" style:parent-style-name="Shapes">
       <style:graphic-properties draw:fill="gradient" draw:fill-gradient-name="Filled"/>
@@ -177,7 +177,7 @@
     </style:style>
     <style:style style:name="BrightBlue-backgroundobjects" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-image-width="0cm" draw:fill-image-height="0cm" 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:text-properties style:font-name="Liberation Sans1" fo:font-family="'Liberation Sans'" style:font-style-name="Normal" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="14pt" style:letter-kerning="true"/>
+      <style:text-properties style:font-name="Liberation Sans1" fo:font-family="'Liberation Sans'" style:font-style-name="Normal" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt" style:letter-kerning="true"/>
     </style:style>
     <style:style style:name="BrightBlue-notes" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none"/>
@@ -234,7 +234,7 @@
     </style:style>
     <style:style style:name="BrightBlue-outline2" style:family="presentation" style:parent-style-name="BrightBlue-outline1">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.324cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="22.7999992370605pt" style:font-size-asian="22.7999992370605pt" style:font-size-complex="22.7999992370605pt"/>
+      <style:text-properties fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
     </style:style>
     <style:style style:name="BrightBlue-outline3" style:family="presentation" style:parent-style-name="BrightBlue-outline2">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.243cm" fo:text-indent="0cm"/>
@@ -242,28 +242,15 @@
     </style:style>
     <style:style style:name="BrightBlue-outline4" style:family="presentation" style:parent-style-name="BrightBlue-outline3">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.162cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="16.2999992370605pt" style:font-size-asian="16.2999992370605pt" style:font-size-complex="16.2999992370605pt"/>
+      <style:text-properties fo:font-size="16pt" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
     </style:style>
     <style:style style:name="BrightBlue-outline5" style:family="presentation" style:parent-style-name="BrightBlue-outline4">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.081cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="16.2999992370605pt" style:font-size-asian="16.2999992370605pt" style:font-size-complex="16.2999992370605pt"/>
-    </style:style>
-    <style:style style:name="BrightBlue-outline6" style:family="presentation" style:parent-style-name="BrightBlue-outline5">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.081cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="16.2999992370605pt" style:font-size-asian="16.2999992370605pt" style:font-size-complex="16.2999992370605pt"/>
-    </style:style>
-    <style:style style:name="BrightBlue-outline7" style:family="presentation" style:parent-style-name="BrightBlue-outline6">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.081cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="16.2999992370605pt" style:font-size-asian="16.2999992370605pt" style:font-size-complex="16.2999992370605pt"/>
-    </style:style>
-    <style:style style:name="BrightBlue-outline8" style:family="presentation" style:parent-style-name="BrightBlue-outline7">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.081cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="16.2999992370605pt" style:font-size-asian="16.2999992370605pt" style:font-size-complex="16.2999992370605pt"/>
-    </style:style>
-    <style:style style:name="BrightBlue-outline9" style:family="presentation" style:parent-style-name="BrightBlue-outline8">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.081cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="16.2999992370605pt" style:font-size-asian="16.2999992370605pt" style:font-size-complex="16.2999992370605pt"/>
     </style:style>
+    <style:style style:name="BrightBlue-outline6" style:family="presentation" style:parent-style-name="BrightBlue-outline5"/>
+    <style:style style:name="BrightBlue-outline7" style:family="presentation" style:parent-style-name="BrightBlue-outline6"/>
+    <style:style style:name="BrightBlue-outline8" style:family="presentation" style:parent-style-name="BrightBlue-outline7"/>
+    <style:style style:name="BrightBlue-outline9" style:family="presentation" style:parent-style-name="BrightBlue-outline8"/>
     <style:style style:name="BrightBlue-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
         <text:list-style style:name="BrightBlue-subtitle">
@@ -358,7 +345,7 @@
         </text:list-style>
       </style:graphic-properties>
       <style:paragraph-properties fo:text-align="start"/>
-      <style:text-properties fo:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="35.7000007629395pt" 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="35.7000007629395pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="35.7000007629395pt" 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:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="36pt" 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="36pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="36pt" 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:presentation-page-layout style:name="AL0T26">
       <presentation:placeholder presentation:object="handout" svg:x="2.058cm" svg:y="1.743cm" svg:width="10.556cm" svg:height="-0.233cm"/>
@@ -564,7 +551,7 @@
         <draw:text-box>
           <text:p text:style-name="MP3">
             <text:span text:style-name="MT1">
-              <text:page-number><Foliennummer></text:page-number>
+              <text:page-number></text:page-number>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -610,7 +597,7 @@
         <draw:text-box>
           <text:p text:style-name="MP3">
             <text:span text:style-name="MT1">
-              <text:page-number><Foliennummer></text:page-number>
+              <text:page-number></text:page-number>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -652,7 +639,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number><Foliennummer></text:page-number>
+                <text:page-number></text:page-number>
               </text:span>
             </text:p>
           </draw:text-box>
commit 382cb25bc16372da853f36c25f7ebba41f88124c
Author:     Laurent BP <laurent.balland-poirier at laposte.net>
AuthorDate: Fri May 8 17:05:59 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun May 10 16:00:35 2020 +0200

    tdf#132771 Update Focus Impress template
    
    * Update preview with Lorem 16:9
    * remove language and country tags in styles.xml
    * add Asian and complex tags in content.xml and styles.xml
    * remove useless text page number in English in styles.xml
    * increase some really tiny font sizes
    
    Change-Id: I884a8ed3a1ee231a2e79b12fd68492672628cd6c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93772
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>

diff --git a/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png b/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png
index 62386413514e..1e895274ddff 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 639b29ad9b25..b3bbcfeb6ae4 100644
--- a/extras/source/templates/presnt/Focus/content.xml
+++ b/extras/source/templates/presnt/Focus/content.xml
@@ -57,7 +57,7 @@
     </style:style>
     <style:style style:name="P1" style:family="paragraph">
       <loext:graphic-properties draw:fill-color="#ffffff"/>
-      <style:text-properties fo:font-size="24pt"/>
+      <style:text-properties fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
     </style:style>
     <style:style style:name="P2" style:family="paragraph">
     </style:style>
diff --git a/extras/source/templates/presnt/Focus/styles.xml b/extras/source/templates/presnt/Focus/styles.xml
index 88787e34ddec..447ef721b2e4 100644
--- a/extras/source/templates/presnt/Focus/styles.xml
+++ b/extras/source/templates/presnt/Focus/styles.xml
@@ -22,7 +22,7 @@
       <style:paragraph-properties style:text-autospace="ideograph-alpha" style:punctuation-wrap="simple" style:line-break="strict" style:font-independent-line-spacing="false">
         <style:tab-stops/>
       </style:paragraph-properties>
-      <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Liberation Sans" fo:font-size="24pt" fo:language="de" fo:country="AT" style:font-name-asian="Segoe UI" style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Tahoma" style:font-size-complex="24pt" style:language-complex="hi" style:country-complex="IN"/>
+      <style:text-properties style:use-window-font-color="true" loext:opacity="0%" style:font-name="Liberation Sans" fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
     </style:default-style>
     <style:style style:name="standard" style:family="graphic">
       <style:graphic-properties draw:stroke="solid" draw:stroke-dash="Dashed_20__28_var_29__20_1" svg:stroke-width="0.05cm" svg:stroke-color="#e8a202" draw:marker-start-width="0.2cm" draw:marker-start-center="false" draw:marker-end-width="0.2cm" draw:marker-end-center="false" draw:fill="solid" draw:fill-color="#fff5ce" draw:textarea-horizontal-align="justify" draw:auto-grow-height="false" fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm" draw:shadow="hidden" draw:shadow-offset-x="0.03cm" draw:shadow-offset-y="0.03cm" draw:shadow-color="#ffe994">
@@ -84,30 +84,30 @@
     </style:style>
     <style:style style:name="A4" style:family="graphic" style:parent-style-name="Text">
       <style:graphic-properties draw:fill="none"/>
-      <style:text-properties fo:font-size="18pt"/>
+      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
     <style:style style:name="Title_20_A4" style:display-name="Title A4" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
-      <style:text-properties fo:font-size="44pt"/>
+      <style:text-properties fo:font-size="44pt" style:font-size-asian="44pt" style:font-size-complex="44pt"/>
     </style:style>
     <style:style style:name="Heading_20_A4" style:display-name="Heading A4" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
-      <style:text-properties fo:font-size="24pt"/>
+      <style:text-properties fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
     </style:style>
     <style:style style:name="Text_20_A4" style:display-name="Text A4" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
     </style:style>
     <style:style style:name="A4" style:family="graphic" style:parent-style-name="Text">
       <style:graphic-properties draw:fill="none"/>
-      <style:text-properties fo:font-size="18pt"/>
+      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
     <style:style style:name="Title_20_A0" style:display-name="Title A0" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
-      <style:text-properties fo:font-size="96pt"/>
+      <style:text-properties fo:font-size="96pt" style:font-size-asian="96pt" style:font-size-complex="96pt"/>
     </style:style>
     <style:style style:name="Heading_20_A0" style:display-name="Heading A0" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
-      <style:text-properties fo:font-size="72pt"/>
+      <style:text-properties fo:font-size="72pt" style:font-size-asian="72pt" style:font-size-complex="72pt"/>
     </style:style>
     <style:style style:name="Text_20_A0" style:display-name="Text A0" style:family="graphic" style:parent-style-name="A4">
       <style:graphic-properties draw:stroke="none"/>
@@ -118,7 +118,7 @@
     </style:style>
     <style:style style:name="Shapes" style:family="graphic" style:parent-style-name="Graphic">
       <style:graphic-properties draw:stroke="none" draw:fill="gradient" draw:fill-gradient-name="Shapes"/>
-      <style:text-properties fo:font-size="14pt" fo:font-weight="bold"/>
+      <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
     </style:style>
     <style:style style:name="Filled" style:family="graphic" style:parent-style-name="Shapes">
       <style:graphic-properties draw:fill="gradient" draw:fill-gradient-name="Filled"/>
@@ -238,52 +238,38 @@
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.374cm" fo:text-align="center" fo:text-indent="0cm">
         <style:tab-stops/>
       </style:paragraph-properties>
-      <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#666666" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="24pt" 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="32pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="32pt" 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" fo:color="#666666" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="24pt" 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="24pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="24pt" 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="Focus-outline2" style:family="presentation" style:parent-style-name="Focus-outline1">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.299cm" fo:text-align="center" fo:text-indent="0cm">
         <style:tab-stops/>
       </style:paragraph-properties>
-      <style:text-properties fo:font-size="18pt"/>
+      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
     <style:style style:name="Focus-outline3" style:family="presentation" style:parent-style-name="Focus-outline2">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.224cm" fo:text-align="center" fo:text-indent="0cm">
         <style:tab-stops/>
       </style:paragraph-properties>
-      <style:text-properties fo:font-size="13.5pt"/>
+      <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
     </style:style>
     <style:style style:name="Focus-outline4" style:family="presentation" style:parent-style-name="Focus-outline3">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.149cm" fo:text-align="center" fo:text-indent="0cm">
         <style:tab-stops/>
       </style:paragraph-properties>
-      <style:text-properties fo:font-size="10.1000003814697pt"/>
+      <style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
     </style:style>
     <style:style style:name="Focus-outline5" style:family="presentation" style:parent-style-name="Focus-outline4">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.075cm" fo:text-align="center" fo:text-indent="0cm">
         <style:tab-stops/>
       </style:paragraph-properties>
-      <style:text-properties fo:font-size="7.59999990463257pt"/>
+      <style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
     </style:style>
     <style:style style:name="Focus-outline6" style:family="presentation" style:parent-style-name="Focus-outline5">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-align="center" fo:text-indent="0cm">
-        <style:tab-stops/>
-      </style:paragraph-properties>
-      <style:text-properties fo:font-size="5.69999980926514pt"/>
-    </style:style>
-    <style:style style:name="Focus-outline7" style:family="presentation" style:parent-style-name="Focus-outline6">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.075cm" fo:text-align="center" fo:text-indent="0cm">
-        <style:tab-stops/>
-      </style:paragraph-properties>
-      <style:text-properties fo:font-size="4.30000019073486pt"/>
-    </style:style>
-    <style:style style:name="Focus-outline8" style:family="presentation" style:parent-style-name="Focus-outline7">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="3.20000004768372pt"/>
-    </style:style>
-    <style:style style:name="Focus-outline9" style:family="presentation" style:parent-style-name="Focus-outline8">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.075cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="2.40000009536743pt"/>
+      <style:text-properties fo:font-size="6pt" style:font-size-asian="6pt" style:font-size-complex="6pt"/>
     </style:style>
+    <style:style style:name="Focus-outline7" style:family="presentation" style:parent-style-name="Focus-outline6"/>
+    <style:style style:name="Focus-outline8" style:family="presentation" style:parent-style-name="Focus-outline7"/>
+    <style:style style:name="Focus-outline9" style:family="presentation" style:parent-style-name="Focus-outline8"/>
     <style:style style:name="Focus-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
         <text:list-style style:name="Focus-subtitle">
@@ -378,7 +364,7 @@
         </text:list-style>
       </style:graphic-properties>
       <style:paragraph-properties fo:text-align="center"/>
-      <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="33pt" 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="44pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="44pt" 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" fo:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="33pt" 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="33pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="33pt" 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="Focus1-background" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none"/>
@@ -439,40 +425,27 @@
         </text:list-style>
       </style:graphic-properties>
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.374cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#666666" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="19.5pt" 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="26pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="26pt" 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" fo:color="#666666" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="20pt" 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="20pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="20pt" 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="Focus1-outline2" style:family="presentation" style:parent-style-name="Focus1-outline1">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.299cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="14.6000003814697pt"/>
+      <style:text-properties fo:font-size="16pt"/>
     </style:style>
     <style:style style:name="Focus1-outline3" style:family="presentation" style:parent-style-name="Focus1-outline2">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.224cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="11pt"/>
+      <style:text-properties fo:font-size="13pt"/>
     </style:style>
     <style:style style:name="Focus1-outline4" style:family="presentation" style:parent-style-name="Focus1-outline3">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.149cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="8.19999980926514pt"/>
+      <style:text-properties fo:font-size="10pt"/>
     </style:style>
     <style:style style:name="Focus1-outline5" style:family="presentation" style:parent-style-name="Focus1-outline4">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="6.09999990463257pt"/>
-    </style:style>
-    <style:style style:name="Focus1-outline6" style:family="presentation" style:parent-style-name="Focus1-outline5">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.075cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="4.59999990463257pt"/>
-    </style:style>
-    <style:style style:name="Focus1-outline7" style:family="presentation" style:parent-style-name="Focus1-outline6">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="3.5pt"/>
-    </style:style>
-    <style:style style:name="Focus1-outline8" style:family="presentation" style:parent-style-name="Focus1-outline7">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="2.59999990463257pt"/>
-    </style:style>
-    <style:style style:name="Focus1-outline9" style:family="presentation" style:parent-style-name="Focus1-outline8">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="1.89999997615814pt"/>
     </style:style>
+    <style:style style:name="Focus1-outline6" style:family="presentation" style:parent-style-name="Focus1-outline5"/>
+    <style:style style:name="Focus1-outline7" style:family="presentation" style:parent-style-name="Focus1-outline6"/>
+    <style:style style:name="Focus1-outline8" style:family="presentation" style:parent-style-name="Focus1-outline7"/>
+    <style:style style:name="Focus1-outline9" style:family="presentation" style:parent-style-name="Focus1-outline8"/>
     <style:style style:name="Focus1-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
         <text:list-style style:name="Focus1-subtitle">
@@ -567,7 +540,7 @@
         </text:list-style>
       </style:graphic-properties>
       <style:paragraph-properties fo:text-align="center"/>
-      <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#333333" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="21pt" 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="28pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="28pt" 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" fo:color="#333333" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="21pt" 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="21pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="21pt" 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="Focus2-background" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none"/>
@@ -628,40 +601,28 @@
         </text:list-style>
       </style:graphic-properties>
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.374cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#666666" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="19.5pt" 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="26pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="26pt" 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" fo:color="#666666" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="20pt" 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="20pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="20pt" 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="Focus2-outline2" style:family="presentation" style:parent-style-name="Focus2-outline1">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.299cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="18pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
+      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
     <style:style style:name="Focus2-outline3" style:family="presentation" style:parent-style-name="Focus2-outline2">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.224cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="15pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+      <style:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Focus2-outline4" style:family="presentation" style:parent-style-name="Focus2-outline3">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.15cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="12pt" style:font-size-asian="16pt" style:font-size-complex="16pt"/>
+      <style:text-properties fo:font-size="12pt" style:font-size-asian="12pt" style:font-size-complex="12pt"/>
     </style:style>
     <style:style style:name="Focus2-outline5" style:family="presentation" style:parent-style-name="Focus2-outline4">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="9pt"/>
-    </style:style>
-    <style:style style:name="Focus2-outline6" style:family="presentation" style:parent-style-name="Focus2-outline5">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="6.69999980926514pt"/>
-    </style:style>
-    <style:style style:name="Focus2-outline7" style:family="presentation" style:parent-style-name="Focus2-outline6">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="5pt"/>
-    </style:style>
-    <style:style style:name="Focus2-outline8" style:family="presentation" style:parent-style-name="Focus2-outline7">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="3.79999995231628pt"/>
-    </style:style>
-    <style:style style:name="Focus2-outline9" style:family="presentation" style:parent-style-name="Focus2-outline8">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.075cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="2.79999995231628pt"/>
+      <style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
     </style:style>
+    <style:style style:name="Focus2-outline6" style:family="presentation" style:parent-style-name="Focus2-outline5"/>
+    <style:style style:name="Focus2-outline7" style:family="presentation" style:parent-style-name="Focus2-outline6"/>
+    <style:style style:name="Focus2-outline8" style:family="presentation" style:parent-style-name="Focus2-outline7"/>
+    <style:style style:name="Focus2-outline9" style:family="presentation" style:parent-style-name="Focus2-outline8"/>
     <style:style style:name="Focus2-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
         <text:list-style style:name="Focus2-subtitle">
@@ -756,7 +717,7 @@
         </text:list-style>
       </style:graphic-properties>
       <style:paragraph-properties fo:text-align="center"/>
-      <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#333333" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="21pt" 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="28pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="28pt" 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" fo:color="#333333" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="21pt" 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="21pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="21pt" 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="Focus3-background" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none"/>
@@ -817,40 +778,27 @@
         </text:list-style>
       </style:graphic-properties>
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.374cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#666666" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="24pt" 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="32pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="32pt" 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" fo:color="#666666" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="24pt" 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="24t" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="24pt" 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="Focus3-outline2" style:family="presentation" style:parent-style-name="Focus3-outline1">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.3cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="21pt" style:font-size-asian="28pt" style:font-size-complex="28pt"/>
+      <style:text-properties fo:font-size="21pt" style:font-size-asian="21pt" style:font-size-complex="21pt"/>
     </style:style>
     <style:style style:name="Focus3-outline3" style:family="presentation" style:parent-style-name="Focus3-outline2">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.224cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="18pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
+      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
     <style:style style:name="Focus3-outline4" style:family="presentation" style:parent-style-name="Focus3-outline3">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.149cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="15pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.15cm" fo:text-indent="0cm"/>
+      <style:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Focus3-outline5" style:family="presentation" style:parent-style-name="Focus3-outline4">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="15pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
-    </style:style>
-    <style:style style:name="Focus3-outline6" style:family="presentation" style:parent-style-name="Focus3-outline5">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="15pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
-    </style:style>
-    <style:style style:name="Focus3-outline7" style:family="presentation" style:parent-style-name="Focus3-outline6">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="15pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
-    </style:style>
-    <style:style style:name="Focus3-outline8" style:family="presentation" style:parent-style-name="Focus3-outline7">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="15pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
-    </style:style>
-    <style:style style:name="Focus3-outline9" style:family="presentation" style:parent-style-name="Focus3-outline8">
-      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.074cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="15pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+      <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.075cm" fo:text-indent="0cm"/>
     </style:style>
+    <style:style style:name="Focus3-outline6" style:family="presentation" style:parent-style-name="Focus3-outline5"/>
+    <style:style style:name="Focus3-outline7" style:family="presentation" style:parent-style-name="Focus3-outline6"/>
+    <style:style style:name="Focus3-outline8" style:family="presentation" style:parent-style-name="Focus3-outline7"/>
+    <style:style style:name="Focus3-outline9" style:family="presentation" style:parent-style-name="Focus3-outline8"/>
     <style:style style:name="Focus3-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
         <text:list-style style:name="Focus3-subtitle">
@@ -945,7 +893,7 @@
         </text:list-style>
       </style:graphic-properties>
       <style:paragraph-properties fo:text-align="center"/>
-      <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#333333" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="30pt" 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="40pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="40pt" 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" fo:color="#333333" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'" style:font-style-name="Book" style:font-pitch="variable" fo:font-size="30pt" 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="30pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="30pt" 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:presentation-page-layout style:name="AL0T26">
       <presentation:placeholder presentation:object="handout" svg:x="2.058cm" svg:y="1.743cm" svg:width="10.556cm" svg:height="-0.233cm"/>
@@ -1353,7 +1301,7 @@
         <draw:text-box>
           <text:p text:style-name="MP3">
             <text:span text:style-name="MT1">
-              <text:page-number><number></text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -1406,7 +1354,7 @@
         <draw:text-box>
           <text:p text:style-name="MP3">
             <text:span text:style-name="MT1">
-              <text:page-number><number></text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -1453,7 +1401,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number><number></text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -1501,7 +1449,7 @@
         <draw:text-box>
           <text:p text:style-name="MP17">
             <text:span text:style-name="MT2">
-              <text:page-number><number></text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -1548,7 +1496,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number><number></text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -1602,7 +1550,7 @@
         <draw:text-box>
           <text:p text:style-name="MP17">
             <text:span text:style-name="MT2">
-              <text:page-number><number></text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -1643,7 +1591,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number><number></text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -1685,7 +1633,7 @@
         <draw:text-box>
           <text:p text:style-name="MP17">
             <text:span text:style-name="MT2">
-              <text:page-number><number></text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -1732,7 +1680,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number><number></text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>


More information about the Libreoffice-commits mailing list