From 288075bf40b3de11b8f45fc67c52ff0d1d1169b5 Mon Sep 17 00:00:00 2001
From: Laurent Balland <laurent.balland@mailo.fr>
Date: Tue, 21 Nov 2023 19:57:21 +0100
Subject: tdf#158203 Freshes Impress template background
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On first master page, move picture from page background to an object at
the background
Other updates:
- remove unused font declarations
- remove english text in number page

Change-Id: I19e2b1f3a6f137ef86e5b43862d4e91ca278f0d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159797
Tested-by: Jenkins
Reviewed-by: Stéphane Guillou <stephane.guillou@libreoffice.org>
Reviewed-by: Laurent Balland <laurent.balland@mailo.fr>
---
 extras/source/templates/presnt/Freshes/content.xml | 10 ----
 extras/source/templates/presnt/Freshes/styles.xml  | 61 ++++++++++------------
 2 files changed, 28 insertions(+), 43 deletions(-)

(limited to 'extras')

diff --git a/extras/source/templates/presnt/Freshes/content.xml b/extras/source/templates/presnt/Freshes/content.xml
index 037a6a82314c..ecaec2274586 100644
--- a/extras/source/templates/presnt/Freshes/content.xml
+++ b/extras/source/templates/presnt/Freshes/content.xml
@@ -2,26 +2,16 @@
 <office:document-content xmlns:officeooo="http://openoffice.org/2009/office" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.3">
   <office:scripts/>
   <office:font-face-decls>
-    <style:font-face style:name="Cantarell" svg:font-family="Cantarell" style:font-pitch="variable"/>
-    <style:font-face style:name="Font Awesome 5 Free Regular" svg:font-family="'Font Awesome 5 Free Regular'" style:font-pitch="variable"/>
-    <style:font-face style:name="Font Awesome 5 Free Solid" svg:font-family="'Font Awesome 5 Free Solid'" style:font-pitch="variable"/>
     <style:font-face style:name="Lato1" svg:font-family="Lato" style:font-pitch="variable"/>
-    <style:font-face style:name="Lato Black" svg:font-family="'Lato Black'" style:font-pitch="variable"/>
     <style:font-face style:name="Lato Black1" svg:font-family="'Lato Black'" style:font-adornments="Black" style:font-pitch="variable"/>
     <style:font-face style:name="Nimbus Sans" svg:font-family="'Nimbus Sans'" style:font-pitch="variable"/>
-    <style:font-face style:name="Noto Sans2" svg:font-family="'Noto Sans'" style:font-pitch="variable"/>
-    <style:font-face style:name="Lato" svg:font-family="Lato" style:font-family-generic="roman" style:font-pitch="variable"/>
     <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
     <style:font-face style:name="Nimbus Roman" svg:font-family="'Nimbus Roman'" style:font-family-generic="roman" style:font-pitch="variable"/>
     <style:font-face style:name="Nimbus Sans1" svg:font-family="'Nimbus Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans" svg:font-family="'Noto Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
-    <style:font-face style:name="Lato2" svg:font-family="Lato" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Nimbus Roman1" svg:font-family="'Nimbus Roman'" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Nimbus Sans2" svg:font-family="'Nimbus Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans1" svg:font-family="'Noto Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans3" svg:font-family="'Noto Sans'" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable"/>
     <style:font-face style:name="Cantarell1" svg:font-family="Cantarell" style:font-family-generic="system" style:font-pitch="variable"/>
-    <style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
     <style:font-face style:name="FreeSerif" svg:font-family="FreeSerif" style:font-family-generic="system" style:font-pitch="variable"/>
     <style:font-face style:name="Nimbus Sans3" svg:font-family="'Nimbus Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
   </office:font-face-decls>
diff --git a/extras/source/templates/presnt/Freshes/styles.xml b/extras/source/templates/presnt/Freshes/styles.xml
index 4672913a991d..ead0ed67ce29 100644
--- a/extras/source/templates/presnt/Freshes/styles.xml
+++ b/extras/source/templates/presnt/Freshes/styles.xml
@@ -1,26 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <office:document-styles xmlns:officeooo="http://openoffice.org/2009/office" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:rpt="http://openoffice.org/2005/report" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xhtml="http://www.w3.org/1999/xhtml" office:version="1.3">
   <office:font-face-decls>
-    <style:font-face style:name="Cantarell" svg:font-family="Cantarell" style:font-pitch="variable"/>
-    <style:font-face style:name="Font Awesome 5 Free Regular" svg:font-family="'Font Awesome 5 Free Regular'" style:font-pitch="variable"/>
-    <style:font-face style:name="Font Awesome 5 Free Solid" svg:font-family="'Font Awesome 5 Free Solid'" style:font-pitch="variable"/>
     <style:font-face style:name="Lato1" svg:font-family="Lato" style:font-pitch="variable"/>
-    <style:font-face style:name="Lato Black" svg:font-family="'Lato Black'" style:font-pitch="variable"/>
     <style:font-face style:name="Lato Black1" svg:font-family="'Lato Black'" style:font-adornments="Black" style:font-pitch="variable"/>
     <style:font-face style:name="Nimbus Sans" svg:font-family="'Nimbus Sans'" style:font-pitch="variable"/>
-    <style:font-face style:name="Noto Sans2" svg:font-family="'Noto Sans'" style:font-pitch="variable"/>
-    <style:font-face style:name="Lato" svg:font-family="Lato" style:font-family-generic="roman" style:font-pitch="variable"/>
     <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
     <style:font-face style:name="Nimbus Roman" svg:font-family="'Nimbus Roman'" style:font-family-generic="roman" style:font-pitch="variable"/>
     <style:font-face style:name="Nimbus Sans1" svg:font-family="'Nimbus Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans" svg:font-family="'Noto Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
-    <style:font-face style:name="Lato2" svg:font-family="Lato" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Nimbus Roman1" svg:font-family="'Nimbus Roman'" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Nimbus Sans2" svg:font-family="'Nimbus Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans1" svg:font-family="'Noto Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans3" svg:font-family="'Noto Sans'" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable"/>
     <style:font-face style:name="Cantarell1" svg:font-family="Cantarell" style:font-family-generic="system" style:font-pitch="variable"/>
-    <style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
     <style:font-face style:name="FreeSerif" svg:font-family="FreeSerif" style:font-family-generic="system" style:font-pitch="variable"/>
     <style:font-face style:name="Nimbus Sans3" svg:font-family="'Nimbus Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
   </office:font-face-decls>
@@ -2335,7 +2325,7 @@
       <style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="27.991cm" fo:page-height="15.748cm" style:print-orientation="landscape"/>
     </style:page-layout>
     <style:style style:name="Mdp1" style:family="drawing-page">
-      <style:drawing-page-properties draw:background-size="border" draw:fill="bitmap" draw:fill-image-name="Main_5f_bg.jpg" style:repeat="stretch" draw:fill-image-ref-point-x="0%" draw:fill-image-ref-point-y="0%" draw:fill-image-ref-point="center"/>
+      <style:drawing-page-properties draw:background-size="border" draw:fill="none"/>
     </style:style>
     <style:style style:name="Mdp2" style:family="drawing-page">
       <style:drawing-page-properties draw:background-size="border" draw:fill="bitmap" draw:fill-image-name="White_25_20clouds_25_20and_25_20blue_25_20skiesss" draw:fill-image-width="61.62cm" draw:fill-image-height="33.223cm" style:repeat="stretch" draw:fill-image-ref-point-x="0%" draw:fill-image-ref-point-y="0%" draw:fill-image-ref-point="top" draw:tile-repeat-offset="0% vertical"/>
@@ -2729,7 +2719,7 @@
         <draw:text-box>
           <text:p text:style-name="MP3">
             <text:span text:style-name="MT1">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -2743,6 +2733,11 @@
     </style:handout-master>
     <style:master-page style:name="Title" style:display-name="Freshes" style:page-layout-name="PM1" draw:style-name="Mdp1">
       <office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
+      <draw:frame draw:style-name="Mgr1" draw:text-style-name="MP1" draw:layer="backgroundobjects" svg:width="28cm" svg:height="15.75cm" svg:x="0cm" svg:y="0cm">
+        <draw:image xlink:href="Pictures/1000000000000B8B0000067F7C4C059ECC323C6F.jpg" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad">
+          <text:p/>
+        </draw:image>
+      </draw:frame>
       <draw:frame presentation:style-name="Title-title" draw:layer="backgroundobjects" svg:width="25.191cm" svg:height="2.629cm" svg:x="1.399cm" svg:y="0.627cm" presentation:class="title" presentation:placeholder="true">
         <draw:text-box/>
       </draw:frame>
@@ -2786,7 +2781,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -2827,7 +2822,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -2869,7 +2864,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -2911,7 +2906,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -2953,7 +2948,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -2995,7 +2990,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -3037,7 +3032,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -3084,7 +3079,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -3126,7 +3121,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -3167,7 +3162,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -3209,7 +3204,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -3252,7 +3247,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -3294,7 +3289,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -3335,7 +3330,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -3377,7 +3372,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -3418,7 +3413,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -3460,7 +3455,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -3503,7 +3498,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -3545,7 +3540,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
@@ -3586,7 +3581,7 @@
         <draw:text-box>
           <text:p text:style-name="MP10">
             <text:span text:style-name="MT2">
-              <text:page-number>&lt;number&gt;</text:page-number>
+              <text:page-number/>
             </text:span>
           </text:p>
         </draw:text-box>
@@ -3628,7 +3623,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>&lt;number&gt;</text:page-number>
+                <text:page-number/>
               </text:span>
             </text:p>
           </draw:text-box>
-- 
cgit