extras/source/templates/presnt/Candy/styles.xml | 2 +-
extras/source/templates/presnt/Freshes/styles.xml | 2 +-
extras/source/templates/presnt/Grey_Elegant/styles.xml | 2 +-
extras/source/templates/presnt/Portfolio/styles.xml | 2 +-
extras/source/templates/presnt/Yellow_Idea/styles.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d4f6202c3ad6f5c970093c7df7c89bba1ba22c3f
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Mon Feb 20 15:44:53 2023 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 28 06:33:31 2023 +0000
tdf#150925 sd: templates: fix missing attribute "style:display-name"
The function GetSelectedMasterPage() search by name, the
missing attributes and it defaults name to "Title", it
contains duplicates and it selects wrong Master Page.
Signed-off-by: Henry Castro <hcas...@collabora.com>
Change-Id: Ia02d66693f33a96cb46fb45b6f435e5cd040ed76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147350
Tested-by: Andras Timar <andras.ti...@collabora.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
(cherry picked from commit e9231535570da032b80cba355cd93c68911b2dbd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147602
Tested-by: Jenkins
diff --git a/extras/source/templates/presnt/Candy/styles.xml
b/extras/source/templates/presnt/Candy/styles.xml
index 54250269d89e..d9ae11fac954 100644
--- a/extras/source/templates/presnt/Candy/styles.xml
+++ b/extras/source/templates/presnt/Candy/styles.xml
@@ -2872,7 +2872,7 @@
</draw:text-box>
</draw:frame>
</style:handout-master>
- <style:master-page style:name="Title" style:page-layout-name="PM1"
draw:style-name="Mdp1">
+ <style:master-page style:name="Title" style:display-name="Candy"
style:page-layout-name="PM1" draw:style-name="Mdp1">
<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>
diff --git a/extras/source/templates/presnt/Freshes/styles.xml
b/extras/source/templates/presnt/Freshes/styles.xml
index 451cf6ad57a1..4672913a991d 100644
--- a/extras/source/templates/presnt/Freshes/styles.xml
+++ b/extras/source/templates/presnt/Freshes/styles.xml
@@ -2741,7 +2741,7 @@
<draw:page-thumbnail draw:layer="backgroundobjects" svg:width="9.294cm"
svg:height="5.228cm" svg:x="11.295cm" svg:y="11.354cm"/>
<draw:page-thumbnail draw:layer="backgroundobjects" svg:width="9.294cm"
svg:height="5.228cm" svg:x="11.295cm" svg:y="19.402cm"/>
</style:handout-master>
- <style:master-page style:name="Title" style:page-layout-name="PM1"
draw:style-name="Mdp1">
+ <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 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/>
diff --git a/extras/source/templates/presnt/Grey_Elegant/styles.xml
b/extras/source/templates/presnt/Grey_Elegant/styles.xml
index a0bc94d63250..c7be043682a9 100644
--- a/extras/source/templates/presnt/Grey_Elegant/styles.xml
+++ b/extras/source/templates/presnt/Grey_Elegant/styles.xml
@@ -2917,7 +2917,7 @@
<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="Title" style:page-layout-name="PM1"
draw:style-name="Mdp1">
+ <style:master-page style:name="Title" style:display-name="Grey Elegant"
style:page-layout-name="PM1" draw:style-name="Mdp1">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
<draw:custom-shape presentation:style-name="Mpr1"
draw:text-style-name="MP5" draw:layer="backgroundobjects" svg:width="28cm"
svg:height="4.32cm" svg:x="0cm" svg:y="11.43cm">
<text:p/>
diff --git a/extras/source/templates/presnt/Portfolio/styles.xml
b/extras/source/templates/presnt/Portfolio/styles.xml
index c3a9c3a462e5..acfad183144c 100644
--- a/extras/source/templates/presnt/Portfolio/styles.xml
+++ b/extras/source/templates/presnt/Portfolio/styles.xml
@@ -1075,7 +1075,7 @@
</draw:text-box>
</draw:frame>
</style:handout-master>
- <style:master-page style:name="Title" style:page-layout-name="PM1"
draw:style-name="Mdp1">
+ <style:master-page style:name="Title" style:display-name="Portfolio"
style:page-layout-name="PM1" draw:style-name="Mdp1">
<draw:frame presentation:style-name="Title-title"
draw:layer="backgroundobjects" svg:width="25cm" svg:height="1.829cm"
svg:x="0.4cm" svg:y="10.8cm" presentation:class="title"
presentation:placeholder="true">
<draw:text-box/>
</draw:frame>
diff --git a/extras/source/templates/presnt/Yellow_Idea/styles.xml
b/extras/source/templates/presnt/Yellow_Idea/styles.xml
index 7585928192cc..00ea6d65ce0b 100644
--- a/extras/source/templates/presnt/Yellow_Idea/styles.xml
+++ b/extras/source/templates/presnt/Yellow_Idea/styles.xml
@@ -2484,7 +2484,7 @@
</draw:text-box>
</draw:frame>
</style:handout-master>
- <style:master-page style:name="Cover" style:page-layout-name="PM1"
draw:style-name="Mdp1">
+ <style:master-page style:name="Cover" style:display-name="Yellow Idea"
style:page-layout-name="PM1" draw:style-name="Mdp1">
<draw:frame presentation:style-name="Cover-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>
