tdf#158202 Candy Impress template background

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

Change-Id: Ieded7b794e00213b7c47e0059bb7120ed133b125
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159794
Tested-by: Jenkins
Reviewed-by: Laurent Balland <laurent.balland@mailo.fr>
(cherry picked from commit c8b21dd6a310ff4fb1dd53c6930768fda34dda4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159896

2 files changed, 25 insertions, 39 deletions

diff --git a/extras/source/templates/presnt/Candy/content.xml b/extras/source/templates/presnt/Candy/content.xml
index aef0e01fa93b..b435ce9c16af 100644
--- a/extras/source/templates/presnt/Candy/content.xml
+++ b/extras/source/templates/presnt/Candy/content.xml
@@ -2,24 +2,15 @@
 <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="Arial1" svg:font-family="Arial" style:font-pitch="variable"/>
     <style:font-face style:name="MS Gothic" svg:font-family="'MS Gothic'" style:font-pitch="variable"/>
     <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-pitch="variable"/>
-    <style:font-face style:name="Montserrat1" svg:font-family="Montserrat" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans CJK SC" svg:font-family="'Noto Sans CJK SC'" style:font-pitch="variable"/>
     <style:font-face style:name="Tahoma1" svg:font-family="Tahoma" style:font-pitch="variable"/>
-    <style:font-face style:name="Arial" svg:font-family="Arial" 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="Montserrat" svg:font-family="Montserrat" 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="Times New Roman" svg:font-family="'Times New Roman'" style:font-family-generic="roman" style:font-pitch="variable"/>
-    <style:font-face style:name="Adobe Fan Heiti Std B" svg:font-family="'Adobe Fan Heiti Std B'" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Arial2" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Liberation Sans1" svg:font-family="'Liberation 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 Sans2" svg:font-family="'Noto Sans'" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Times New Roman1" svg:font-family="'Times New Roman'" style:font-family-generic="swiss" 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="Lohit Devanagari" svg:font-family="'Lohit Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/>
     <style:font-face style:name="Mangal1" svg:font-family="Mangal" style:font-family-generic="system" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans CJK SC1" svg:font-family="'Noto Sans CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
diff --git a/extras/source/templates/presnt/Candy/styles.xml b/extras/source/templates/presnt/Candy/styles.xml
index d9ae11fac954..1f14a5a3f08f 100644
--- a/extras/source/templates/presnt/Candy/styles.xml
+++ b/extras/source/templates/presnt/Candy/styles.xml
@@ -1,24 +1,15 @@
 <?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="Arial1" svg:font-family="Arial" style:font-pitch="variable"/>
     <style:font-face style:name="MS Gothic" svg:font-family="'MS Gothic'" style:font-pitch="variable"/>
     <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-pitch="variable"/>
-    <style:font-face style:name="Montserrat1" svg:font-family="Montserrat" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans CJK SC" svg:font-family="'Noto Sans CJK SC'" style:font-pitch="variable"/>
     <style:font-face style:name="Tahoma1" svg:font-family="Tahoma" style:font-pitch="variable"/>
-    <style:font-face style:name="Arial" svg:font-family="Arial" 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="Montserrat" svg:font-family="Montserrat" 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="Times New Roman" svg:font-family="'Times New Roman'" style:font-family-generic="roman" style:font-pitch="variable"/>
-    <style:font-face style:name="Adobe Fan Heiti Std B" svg:font-family="'Adobe Fan Heiti Std B'" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Arial2" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Liberation Sans1" svg:font-family="'Liberation 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 Sans2" svg:font-family="'Noto Sans'" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable"/>
-    <style:font-face style:name="Times New Roman1" svg:font-family="'Times New Roman'" style:font-family-generic="swiss" 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="Lohit Devanagari" svg:font-family="'Lohit Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/>
     <style:font-face style:name="Mangal1" svg:font-family="Mangal" style:font-family-generic="system" style:font-pitch="variable"/>
     <style:font-face style:name="Noto Sans CJK SC1" svg:font-family="'Noto Sans CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
@@ -35,7 +26,6 @@
     <draw:fill-image draw:name="Bitmap_20_10" draw:display-name="Bitmap 10" xlink:href="Pictures/10000000000004A800000500DD5BB9FFED422172.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
     <draw:fill-image draw:name="Bitmap_20_11" draw:display-name="Bitmap 11" xlink:href="Pictures/1000000000000780000004383B6CE268A9802A07.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
     <draw:fill-image draw:name="Bitmap_20_9" draw:display-name="Bitmap 9" xlink:href="Pictures/10000000000005000000050014DEA376B6E67205.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
-    <draw:fill-image draw:name="background" xlink:href="Pictures/10000000000007800000043870026B1FACED0D1B.png" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
     <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z"/>
     <draw:stroke-dash draw:name="Dashed_20__28_var_29__20_4" draw:display-name="Dashed (var) 4" draw:style="rect" draw:dots1="1" draw:dots1-length="0.02cm" draw:dots2="1" draw:dots2-length="0.02cm" draw:distance="0.02cm"/>
     <style:default-style style:family="graphic">
@@ -189,7 +179,7 @@
       <style:graphic-properties draw:stroke="dash"/>
     </style:style>
     <style:style style:name="Title-background" style:family="presentation">
-      <style:graphic-properties draw:stroke="none" draw:fill="bitmap" draw:fill-image-name="background" style:repeat="stretch"/>
+      <style:graphic-properties draw:stroke="none" draw:fill="none"/>
       <style:text-properties style:letter-kerning="true"/>
     </style:style>
     <style:style style:name="Title-backgroundobjects" style:family="presentation">
@@ -2306,7 +2296,7 @@
       <style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="28cm" fo:page-height="15.75cm" 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="background" style:repeat="stretch"/>
+      <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="none"/>
@@ -2863,7 +2853,7 @@
         <draw:text-box>
           <text:p text:style-name="MP3">
             <text:span text:style-name="MT1">
-              <text:page-number>13</text:page-number>
+              <text:page-number/>
             </text:span>
             <text:span text:style-name="MT1">
               <text:s/>
@@ -2873,6 +2863,11 @@
       </draw:frame>
     </style:handout-master>
     <style:master-page style:name="Title" style:display-name="Candy" style:page-layout-name="PM1" draw:style-name="Mdp1">
+      <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/10000000000007800000043870026B1FACED0D1B.png" 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.199cm" svg:height="2.629cm" svg:x="1.4cm" svg:y="0.628cm" presentation:class="title" presentation:placeholder="true">
         <draw:text-box/>
       </draw:frame>
@@ -2924,7 +2919,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -3016,7 +3011,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -3132,7 +3127,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -3177,7 +3172,7 @@
         <draw:text-box>
           <text:p text:style-name="MP22">
             <text:span text:style-name="MT3">
-              <text:page-number>13</text:page-number>
+              <text:page-number/>
             </text:span>
             <text:span text:style-name="MT3">
               <text:s/>
@@ -3270,7 +3265,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -3363,7 +3358,7 @@
         <draw:text-box>
           <text:p text:style-name="MP22">
             <text:span text:style-name="MT3">
-              <text:page-number>13</text:page-number>
+              <text:page-number/>
             </text:span>
             <text:span text:style-name="MT3">
               <text:s/>
@@ -3456,7 +3451,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -3617,7 +3612,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -3693,7 +3688,7 @@
         <draw:text-box>
           <text:p text:style-name="MP22">
             <text:span text:style-name="MT3">
-              <text:page-number>13</text:page-number>
+              <text:page-number/>
             </text:span>
             <text:span text:style-name="MT3">
               <text:s/>
@@ -3746,7 +3741,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -3823,7 +3818,7 @@
         <draw:text-box>
           <text:p text:style-name="MP3">
             <text:span text:style-name="MT1">
-              <text:page-number>13</text:page-number>
+              <text:page-number/>
             </text:span>
             <text:span text:style-name="MT1">
               <text:s/>
@@ -3876,7 +3871,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -3924,7 +3919,7 @@
         <draw:text-box>
           <text:p text:style-name="MP22">
             <text:span text:style-name="MT3">
-              <text:page-number>13</text:page-number>
+              <text:page-number/>
             </text:span>
             <text:span text:style-name="MT3">
               <text:s/>
@@ -3977,7 +3972,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -4090,7 +4085,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>
@@ -4135,7 +4130,7 @@
         <draw:text-box>
           <text:p text:style-name="MP22">
             <text:span text:style-name="MT3">
-              <text:page-number>13</text:page-number>
+              <text:page-number/>
             </text:span>
             <text:span text:style-name="MT3">
               <text:s/>
@@ -4188,7 +4183,7 @@
           <draw:text-box>
             <text:p text:style-name="MP3">
               <text:span text:style-name="MT1">
-                <text:page-number>13</text:page-number>
+                <text:page-number/>
               </text:span>
               <text:span text:style-name="MT1">
                 <text:s/>