tdf#135060 Modify Progress template

Rename Master Page Progress_2 to Progress
Correct attribute error for font size
When using template as master page, styles Accent_x are not imported
This patch add direct formating to keep format when using template as
master page.

Change-Id: If2eaee8e96c93e98cd90ded4979924d2c9a7f63e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139773
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

2 files changed, 32 insertions, 32 deletions

diff --git a/extras/source/templates/presnt/Progress/content.xml b/extras/source/templates/presnt/Progress/content.xml
index d789ca2281c8..cc08d740020b 100644
--- a/extras/source/templates/presnt/Progress/content.xml
+++ b/extras/source/templates/presnt/Progress/content.xml
@@ -27,13 +27,13 @@
     <style:style style:name="gr1" style:family="graphic">
       <style:graphic-properties style:protect="size"/>
     </style:style>
-    <style:style style:name="pr1" style:family="presentation" style:parent-style-name="Progress_5f_2-title">
+    <style:style style:name="pr1" style:family="presentation" style:parent-style-name="Progress-title">
       <style:graphic-properties draw:auto-grow-height="true" fo:min-height="4.466cm"/>
     </style:style>
-    <style:style style:name="pr2" style:family="presentation" style:parent-style-name="Progress_5f_2-subtitle">
+    <style:style style:name="pr2" style:family="presentation" style:parent-style-name="Progress-subtitle">
       <style:graphic-properties draw:fill-color="#ffffff" draw:auto-grow-height="true" fo:min-height="1.721cm"/>
     </style:style>
-    <style:style style:name="pr3" style:family="presentation" style:parent-style-name="Progress_5f_2-notes">
+    <style:style style:name="pr3" style:family="presentation" style:parent-style-name="Progress-notes">
       <style:graphic-properties draw:fill-color="#ffffff" draw:auto-grow-height="true" fo:min-height="13.364cm"/>
     </style:style>
     <style:style style:name="pr4" style:family="presentation" style:parent-style-name="Standard_20_1-title">
@@ -122,7 +122,7 @@
   <office:body>
     <office:presentation>
       <presentation:date-time-decl presentation:name="dtd1" presentation:source="current-date" style:data-style-name="D3"/>
-      <draw:page draw:name="page1" draw:style-name="dp1" draw:master-page-name="Progress_5f_2" presentation:presentation-page-layout-name="AL1T0" presentation:use-footer-name="ftr1" presentation:use-date-time-name="dtd1" xml:id="id1" draw:id="id1">
+      <draw:page draw:name="page1" draw:style-name="dp1" draw:master-page-name="Progress" presentation:presentation-page-layout-name="AL1T0" presentation:use-footer-name="ftr1" presentation:use-date-time-name="dtd1" xml:id="id1" draw:id="id1">
         <office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
         <draw:frame presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="layout" svg:width="25.007cm" svg:height="4.466cm" draw:transform="rotate (0.141371669411541) translate (1.05cm 8.049cm)" presentation:class="title" presentation:placeholder="true" presentation:user-transformed="true">
           <draw:text-box/>
diff --git a/extras/source/templates/presnt/Progress/styles.xml b/extras/source/templates/presnt/Progress/styles.xml
index 16e18e03cf98..ba7119d352f4 100644
--- a/extras/source/templates/presnt/Progress/styles.xml
+++ b/extras/source/templates/presnt/Progress/styles.xml
@@ -175,23 +175,23 @@
       <style:graphic-properties svg:stroke-color="#ffe994" draw:fill="solid" draw:fill-color="#cccccc"/>
     </style:style>
     <style:style style:name="Accent_20_3" style:display-name="Accent 3" style:family="graphic" style:parent-style-name="Accent"/>
-    <style:style style:name="Progress_5f_2-background" style:display-name="Progress_2-background" style:family="presentation">
+    <style:style style:name="Progress-background" style:display-name="Progress-background" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#b4d435" draw:fill-image-width="0cm" draw:fill-image-height="0cm"/>
       <style:text-properties style:letter-kerning="true"/>
     </style:style>
-    <style:style style:name="Progress_5f_2-backgroundobjects" style:display-name="Progress_2-backgroundobjects" style:family="presentation">
+    <style:style style:name="Progress-backgroundobjects" style:display-name="Progress-backgroundobjects" style:family="presentation">
       <style:graphic-properties 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:paragraph-properties fo:text-align="end"/>
       <style:text-properties style:font-name="Liberation Sans Narrow2" fo:font-family="&apos;Liberation Sans Narrow&apos;" style:font-style-name="Regular" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" fo:font-weight="normal" style:letter-kerning="true" style:font-size-asian="14pt" style:font-weight-asian="normal" style:font-size-complex="14pt" style:font-weight-complex="normal"/>
     </style:style>
-    <style:style style:name="Progress_5f_2-notes" style:display-name="Progress_2-notes" style:family="presentation">
+    <style:style style:name="Progress-notes" style:display-name="Progress-notes" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none"/>
       <style:paragraph-properties fo:margin-left="0.6cm" fo:margin-right="0cm" fo:text-indent="-0.6cm"/>
       <style:text-properties 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="&apos;Liberation Sans&apos;" style:font-family-generic="roman" 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="Progress_5f_2-outline1" style:display-name="Progress_2-outline1" style:family="presentation">
+    <style:style style:name="Progress-outline1" style:display-name="Progress-outline1" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:fit-to-size="shrink-to-fit" style:shrink-to-fit="true">
-        <text:list-style style:name="Progress_5f_2-outline1" style:display-name="Progress_2-outline1">
+        <text:list-style style:name="Progress-outline1" style:display-name="Progress-outline1">
           <text:list-level-style-bullet text:level="1" text:bullet-char="●">
             <style:list-level-properties text:space-before="0.3cm" text:min-label-width="0.9cm"/>
             <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
@@ -237,28 +237,28 @@
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.417cm" fo:text-align="center" fo:text-indent="0cm"/>
       <style:text-properties 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 Sans4" fo:font-family="&apos;Liberation Sans&apos;" style:font-style-name="Regular" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="27pt" 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="27pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="27pt" 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="Progress_5f_2-outline2" style:display-name="Progress_2-outline2" style:family="presentation" style:parent-style-name="Progress_5f_2-outline1">
+    <style:style style:name="Progress-outline2" style:display-name="Progress-outline2" style:family="presentation" style:parent-style-name="Progress-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="21pt" style:font-size-complex="21pt"/>
     </style:style>
-    <style:style style:name="Progress_5f_2-outline3" style:display-name="Progress_2-outline3" style:family="presentation" style:parent-style-name="Progress_5f_2-outline2">
+    <style:style style:name="Progress-outline3" style:display-name="Progress-outline3" style:family="presentation" style:parent-style-name="Progress-outline2">
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.225cm" fo:text-indent="0cm"/>
-      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18t"/>
+      <style:text-properties fo:font-size="18pt" style:font-size-asian="18pt" style:font-size-complex="18pt"/>
     </style:style>
-    <style:style style:name="Progress_5f_2-outline4" style:display-name="Progress_2-outline4" style:family="presentation" style:parent-style-name="Progress_5f_2-outline3">
+    <style:style style:name="Progress-outline4" style:display-name="Progress-outline4" style:family="presentation" style:parent-style-name="Progress-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="15pt" style:font-size-asian="15pt" style:font-size-complex="15pt"/>
     </style:style>
-    <style:style style:name="Progress_5f_2-outline5" style:display-name="Progress_2-outline5" style:family="presentation" style:parent-style-name="Progress_5f_2-outline4">
+    <style:style style:name="Progress-outline5" style:display-name="Progress-outline5" style:family="presentation" style:parent-style-name="Progress-outline4">
       <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="Progress_5f_2-outline6" style:display-name="Progress_2-outline6" style:family="presentation" style:parent-style-name="Progress_5f_2-outline5"/>
-    <style:style style:name="Progress_5f_2-outline7" style:display-name="Progress_2-outline7" style:family="presentation" style:parent-style-name="Progress_5f_2-outline6"/>
-    <style:style style:name="Progress_5f_2-outline8" style:display-name="Progress_2-outline8" style:family="presentation" style:parent-style-name="Progress_5f_2-outline7"/>
-    <style:style style:name="Progress_5f_2-outline9" style:display-name="Progress_2-outline9" style:family="presentation" style:parent-style-name="Progress_5f_2-outline8"/>
-    <style:style style:name="Progress_5f_2-subtitle" style:display-name="Progress_2-subtitle" style:family="presentation">
+    <style:style style:name="Progress-outline6" style:display-name="Progress-outline6" style:family="presentation" style:parent-style-name="Progress-outline5"/>
+    <style:style style:name="Progress-outline7" style:display-name="Progress-outline7" style:family="presentation" style:parent-style-name="Progress-outline6"/>
+    <style:style style:name="Progress-outline8" style:display-name="Progress-outline8" style:family="presentation" style:parent-style-name="Progress-outline7"/>
+    <style:style style:name="Progress-outline9" style:display-name="Progress-outline9" style:family="presentation" style:parent-style-name="Progress-outline8"/>
+    <style:style style:name="Progress-subtitle" style:display-name="Progress-subtitle" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
-        <text:list-style style:name="Progress_5f_2-subtitle" style:display-name="Progress_2-subtitle">
+        <text:list-style style:name="Progress-subtitle" style:display-name="Progress-subtitle">
           <text:list-level-style-bullet text:level="1" text:bullet-char="●">
             <style:list-level-properties/>
             <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
@@ -304,9 +304,9 @@
       <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" fo:text-indent="0cm"/>
       <style:text-properties 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="&apos;Liberation Sans&apos;" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="32pt" 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:style>
-    <style:style style:name="Progress_5f_2-title" style:display-name="Progress_2-title" style:family="presentation">
+    <style:style style:name="Progress-title" style:display-name="Progress-title" style:family="presentation">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
-        <text:list-style style:name="Progress_5f_2-title" style:display-name="Progress_2-title">
+        <text:list-style style:name="Progress-title" style:display-name="Progress-title">
           <text:list-level-style-bullet text:level="1" text:bullet-char="●">
             <style:list-level-properties/>
             <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
@@ -929,7 +929,7 @@
       <style:paragraph-properties style:writing-mode="lr-tb"/>
     </style:style>
     <style:style style:name="Mgr3" style:family="graphic" style:parent-style-name="standard">
-      <style:graphic-properties draw:textarea-vertical-align="middle"/>
+      <style:graphic-properties draw:stroke="solid" draw:stroke-dash="Dashed_20__28_var_29__20_1" svg:stroke-width="0.03cm" svg:stroke-color="#999999" 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="#dddddd" 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="hidden" draw:shadow-offset-x="0.07cm" draw:shadow-offset-y="0.07cm" draw:shadow-color="#eeeeee" draw:textarea-vertical-align="middle"/>
     </style:style>
     <style:style style:name="Mgr4" style:family="graphic" style:parent-style-name="Accent_20_1">
       <style:graphic-properties draw:textarea-vertical-align="middle"/>
@@ -941,19 +941,19 @@
       <style:graphic-properties draw:stroke="none" svg:stroke-color="#000000" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="true" draw:auto-grow-width="false" fo:max-height="0cm" fo:min-height="3.155cm"/>
       <style:paragraph-properties style:writing-mode="lr-tb"/>
     </style:style>
-    <style:style style:name="Mpr1" style:family="presentation" style:parent-style-name="Progress_5f_2-title">
+    <style:style style:name="Mpr1" style:family="presentation" style:parent-style-name="Progress-title">
       <style:graphic-properties draw:auto-grow-height="false" fo:min-height="3.508cm"/>
       <style:paragraph-properties style:writing-mode="lr-tb"/>
     </style:style>
-    <style:style style:name="Mpr2" style:family="presentation" style:parent-style-name="Progress_5f_2-backgroundobjects">
+    <style:style style:name="Mpr2" style:family="presentation" style:parent-style-name="Progress-backgroundobjects">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.449cm"/>
       <style:paragraph-properties style:writing-mode="lr-tb"/>
     </style:style>
-    <style:style style:name="Mpr3" style:family="presentation" style:parent-style-name="Progress_5f_2-backgroundobjects">
+    <style:style style:name="Mpr3" style:family="presentation" style:parent-style-name="Progress-backgroundobjects">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.485cm"/>
       <style:paragraph-properties style:writing-mode="lr-tb"/>
     </style:style>
-    <style:style style:name="Mpr4" style:family="presentation" style:parent-style-name="Progress_5f_2-backgroundobjects">
+    <style:style style:name="Mpr4" style:family="presentation" style:parent-style-name="Progress-backgroundobjects">
       <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:textarea-vertical-align="bottom" draw:auto-grow-height="false" fo:min-height="1.485cm"/>
       <style:paragraph-properties style:writing-mode="lr-tb"/>
     </style:style>
@@ -1224,8 +1224,8 @@
       <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="5.061cm" svg:x="11cm" svg:y="12.318cm"/>
       <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="5.061cm" svg:x="11cm" svg:y="20.894cm"/>
     </style:handout-master>
-    <style:master-page style:name="Progress_5f_2" style:display-name="Progress_2" style:page-layout-name="PM1" draw:style-name="Mdp1">
-      <draw:polygon draw:style-name="Mgr3" draw:layer="backgroundobjects" svg:width="27.999cm" svg:height="11.81cm" svg:x="0cm" svg:y="0cm" svg:viewBox="0 0 28000 11811" draw:points="0,11811 0,0 28000,0 28000,7811">
+    <style:master-page style:name="Progress" style:display-name="Progress" style:page-layout-name="PM1" draw:style-name="Mdp1">
+      <draw:polygon draw:style-name="Mgr3" draw:layer="backgroundobjects" svg:width="28cm" svg:height="11.81cm" svg:x="0cm" svg:y="0cm" svg:viewBox="0 0 28000 11811" draw:points="0,11811 0,0 28000,0 28000,7811">
         <text:p/>
       </draw:polygon>
       <draw:frame presentation:style-name="Mpr1" draw:text-style-name="MP5" draw:layer="backgroundobjects" svg:width="25.005cm" svg:height="2.65cm" draw:transform="rotate (0.142244334037538) translate (1.295cm 9.021cm)" presentation:class="title" presentation:placeholder="true">
@@ -1233,7 +1233,7 @@
           <text:p/>
         </draw:text-box>
       </draw:frame>
-      <draw:frame presentation:style-name="Progress_5f_2-outline1" draw:layer="backgroundobjects" svg:width="24.45cm" svg:height="9.206cm" draw:transform="rotate (0.142244334037538) translate (0.757cm 11.796cm)" presentation:class="outline" presentation:placeholder="true">
+      <draw:frame presentation:style-name="Progress-outline1" draw:layer="backgroundobjects" svg:width="24.45cm" svg:height="9.206cm" draw:transform="rotate (0.142244334037538) translate (0.757cm 11.796cm)" presentation:class="outline" presentation:placeholder="true">
         <draw:text-box/>
       </draw:frame>
       <draw:frame presentation:style-name="Mpr2" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="8cm" svg:height="1.087cm" svg:x="19.499cm" svg:y="13.649cm" presentation:class="date-time">
@@ -1264,8 +1264,8 @@
         </draw:text-box>
       </draw:frame>
       <presentation:notes style:page-layout-name="PM0">
-        <draw:page-thumbnail presentation:style-name="Progress_5f_2-title" draw:layer="backgroundobjects" svg:width="14.848cm" svg:height="11.136cm" svg:x="3.075cm" svg:y="2.257cm" presentation:class="page"/>
-        <draw:frame presentation:style-name="Progress_5f_2-notes" draw:layer="backgroundobjects" svg:width="16.799cm" svg:height="13.364cm" svg:x="2.1cm" svg:y="14.107cm" presentation:class="notes" presentation:placeholder="true">
+        <draw:page-thumbnail presentation:style-name="Progress-title" draw:layer="backgroundobjects" svg:width="14.848cm" svg:height="11.136cm" svg:x="3.075cm" svg:y="2.257cm" presentation:class="page"/>
+        <draw:frame presentation:style-name="Progress-notes" draw:layer="backgroundobjects" svg:width="16.799cm" svg:height="13.364cm" svg:x="2.1cm" svg:y="14.107cm" presentation:class="notes" presentation:placeholder="true">
           <draw:text-box/>
         </draw:frame>
         <draw:frame presentation:style-name="Mpr3" draw:text-style-name="MP2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">