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

Laurent BP (via logerrit) logerrit at kemper.freedesktop.org
Mon May 11 05:40:14 UTC 2020


 extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png |binary
 extras/source/templates/presnt/DNA/styles.xml               |   34 ++++--------
 2 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit 86bc13248c1d9f63b10aac304bdf0361d1dcc47f
Author:     Laurent BP <laurent.balland-poirier at laposte.net>
AuthorDate: Fri May 8 16:27:09 2020 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Mon May 11 07:39:39 2020 +0200

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

diff --git a/extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png b/extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png
index cb461301343f..507d9b0a929c 100644
Binary files a/extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/DNA/Thumbnails/thumbnail.png differ
diff --git a/extras/source/templates/presnt/DNA/styles.xml b/extras/source/templates/presnt/DNA/styles.xml
index debede69a145..e305022c66d0 100644
--- a/extras/source/templates/presnt/DNA/styles.xml
+++ b/extras/source/templates/presnt/DNA/styles.xml
@@ -18,7 +18,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 Serif" 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 Serif" 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="#2a6099" 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="#dee6ef" 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.05cm" draw:shadow-offset-y="0.05cm" draw:shadow-color="#ff5429">
@@ -80,30 +80,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"/>
@@ -114,7 +114,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="Formen"/>
-      <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="Ausgefüllt"/>
@@ -250,18 +250,10 @@
     <style:style style:name="DNA-outline5" style:family="presentation" style:parent-style-name="DNA-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:style>
-    <style:style style:name="DNA-outline6" style:family="presentation" style:parent-style-name="DNA-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:style>
-    <style:style style:name="DNA-outline7" style:family="presentation" style:parent-style-name="DNA-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:style>
-    <style:style style:name="DNA-outline8" style:family="presentation" style:parent-style-name="DNA-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:style>
-    <style:style style:name="DNA-outline9" style:family="presentation" style:parent-style-name="DNA-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:style>
+    <style:style style:name="DNA-outline6" style:family="presentation" style:parent-style-name="DNA-outline5"/>
+    <style:style style:name="DNA-outline7" style:family="presentation" style:parent-style-name="DNA-outline6"/>
+    <style:style style:name="DNA-outline8" style:family="presentation" style:parent-style-name="DNA-outline7"/>
+    <style:style style:name="DNA-outline9" style:family="presentation" style:parent-style-name="DNA-outline8"/>
     <style:style style:name="DNA-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
         <text:list-style style:name="DNA-subtitle">
@@ -948,7 +940,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>1</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>


More information about the Libreoffice-commits mailing list