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

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


 dev/null                                                        |binary
 extras/CustomTarget_tplpresnt.mk                                |    1 
 extras/source/templates/presnt/Beehive/META-INF/manifest.xml    |    1 
 extras/source/templates/presnt/Beehive/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/Beehive/content.xml              |    2 
 extras/source/templates/presnt/Beehive/styles.xml               |   65 ++++------
 6 files changed, 33 insertions(+), 36 deletions(-)

New commits:
commit 2c7007d5890252b38beaee69c2e0af1341775544
Author:     Laurent BP <laurent.balland-poirier at laposte.net>
AuthorDate: Fri May 8 12:46:43 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun May 10 16:01:03 2020 +0200

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

diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk
index cbdbd5510547..9767be4a0753 100644
--- a/extras/CustomTarget_tplpresnt.mk
+++ b/extras/CustomTarget_tplpresnt.mk
@@ -44,7 +44,6 @@ extras_PRESENTATIONS_XMLFILES := \
 	Beehive/content.xml \
 	Beehive/META-INF/manifest.xml \
 	Beehive/meta.xml \
-	Beehive/Pictures/1000000000000020000000204B249CA79A42C6D7.png \
 	Beehive/styles.xml \
 	Beehive/Thumbnails/thumbnail.png \
 	Blue_Curve/content.xml \
diff --git a/extras/source/templates/presnt/Beehive/META-INF/manifest.xml b/extras/source/templates/presnt/Beehive/META-INF/manifest.xml
index 6612d22c7d9d..c3e1aec9147d 100644
--- a/extras/source/templates/presnt/Beehive/META-INF/manifest.xml
+++ b/extras/source/templates/presnt/Beehive/META-INF/manifest.xml
@@ -4,6 +4,5 @@
   <manifest:file-entry manifest:full-path="Thumbnails/thumbnail.png" manifest:media-type="image/png"/>
   <manifest:file-entry manifest:full-path="meta.xml" manifest:media-type="text/xml"/>
   <manifest:file-entry manifest:full-path="content.xml" manifest:media-type="text/xml"/>
-  <manifest:file-entry manifest:full-path="Pictures/1000000000000020000000204B249CA79A42C6D7.png" manifest:media-type="image/png"/>
   <manifest:file-entry manifest:full-path="styles.xml" manifest:media-type="text/xml"/>
 </manifest:manifest>
diff --git a/extras/source/templates/presnt/Beehive/Pictures/1000000000000020000000204B249CA79A42C6D7.png b/extras/source/templates/presnt/Beehive/Pictures/1000000000000020000000204B249CA79A42C6D7.png
deleted file mode 100644
index 45b401dc6037..000000000000
Binary files a/extras/source/templates/presnt/Beehive/Pictures/1000000000000020000000204B249CA79A42C6D7.png and /dev/null differ
diff --git a/extras/source/templates/presnt/Beehive/Thumbnails/thumbnail.png b/extras/source/templates/presnt/Beehive/Thumbnails/thumbnail.png
index 787ad446f706..fcd4dc764733 100644
Binary files a/extras/source/templates/presnt/Beehive/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/Beehive/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/Beehive/content.xml b/extras/source/templates/presnt/Beehive/content.xml
index 1643b9075d69..7c115ee12997 100644
--- a/extras/source/templates/presnt/Beehive/content.xml
+++ b/extras/source/templates/presnt/Beehive/content.xml
@@ -36,7 +36,7 @@
     </style:style>
     <style:style style:name="P2" 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="P3" style:family="paragraph">
       <loext:graphic-properties draw:fill-color="#ffffff"/>
diff --git a/extras/source/templates/presnt/Beehive/styles.xml b/extras/source/templates/presnt/Beehive/styles.xml
index 29fd2ef29b0e..a5279cf625cb 100644
--- a/extras/source/templates/presnt/Beehive/styles.xml
+++ b/extras/source/templates/presnt/Beehive/styles.xml
@@ -10,7 +10,7 @@
       <style:paragraph-properties style:text-autospace="none" 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="#ffbf00" draw:marker-start-width="0.28cm" draw:marker-start-center="false" draw:marker-end-width="0.28cm" 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">
@@ -72,41 +72,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"/>
@@ -226,39 +226,39 @@
         </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" 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="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" 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" 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="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" 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="Beehive-outline2" style:family="presentation" style:parent-style-name="Beehive-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="Beehive-outline3" style:family="presentation" style:parent-style-name="Beehive-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="Beehive-outline4" style:family="presentation" style:parent-style-name="Beehive-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive-outline5" style:family="presentation" style:parent-style-name="Beehive-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive-outline6" style:family="presentation" style:parent-style-name="Beehive-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive-outline7" style:family="presentation" style:parent-style-name="Beehive-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive-outline8" style:family="presentation" style:parent-style-name="Beehive-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive-outline9" style:family="presentation" style:parent-style-name="Beehive-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
@@ -354,7 +354,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" 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="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" 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" 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="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" 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="Beehive1-background" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none"/>
@@ -415,39 +415,39 @@
         </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" 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="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" 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" 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="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" 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="Beehive1-outline2" style:family="presentation" style:parent-style-name="Beehive1-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="Beehive1-outline3" style:family="presentation" style:parent-style-name="Beehive1-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="Beehive1-outline4" style:family="presentation" style:parent-style-name="Beehive1-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive1-outline5" style:family="presentation" style:parent-style-name="Beehive1-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive1-outline6" style:family="presentation" style:parent-style-name="Beehive1-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive1-outline7" style:family="presentation" style:parent-style-name="Beehive1-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:text-properties fo:font-size="15pt" style:font-size-asian="15t" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive1-outline8" style:family="presentation" style:parent-style-name="Beehive1-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive1-outline9" style:family="presentation" style:parent-style-name="Beehive1-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:text-properties fo:font-size="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
     <style:style style:name="Beehive1-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
@@ -543,7 +543,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" 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="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" 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" 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="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" 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: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"/>
@@ -640,7 +640,6 @@
     <style:style style:name="MP5" style:family="paragraph">
       <loext:graphic-properties draw:opacity="100%"/>
       <style:paragraph-properties fo:text-align="center" style:writing-mode="lr-tb" style:font-independent-line-spacing="true"/>
-      <style:text-properties fo:language="en" fo:country="US" style:font-name-asian="Microsoft YaHei" style:font-name-complex="Mangal"/>
     </style:style>
     <style:style style:name="MP6" style:family="paragraph">
       <style:paragraph-properties fo:text-align="center"/>
@@ -3161,7 +3160,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:page-number>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -4130,7 +4129,7 @@
         <draw:text-box>
           <text:p text:style-name="MP6">
             <text:span text:style-name="MT1">
-              <text:page-number><number></text:page-number>
+              <text:page-number></text:page-number>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -4171,7 +4170,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:page-number>
               </text:span>
             </text:p>
           </draw:text-box>


More information about the Libreoffice-commits mailing list