extras/source/templates/presnt/Freshes/content.xml | 69 +++++++++++++--------
extras/source/templates/presnt/Freshes/styles.xml | 27 +++++---
2 files changed, 62 insertions(+), 34 deletions(-)
New commits:
commit ce56d12673538482dd2e94d0c4260967fe0a7e5d
Author: Laurent Balland <laurent.ball...@mailo.fr>
AuthorDate: Sat Jun 29 12:03:20 2024 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Mon Jul 15 10:43:48 2024 +0200
tdf#161799 Preserve default styles in Freshes template
Same as https://gerrit.libreoffice.org/c/core/+/169661
for Freshes template
Change-Id: I20630ef6a1b1c31c9b91bfc4c3389609586c6414
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169768
Reviewed-by: Laurent Balland <laurent.ball...@mailo.fr>
Tested-by: Jenkins
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170463
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/extras/source/templates/presnt/Freshes/content.xml
b/extras/source/templates/presnt/Freshes/content.xml
index 672d5f69ee3b..b90d7fcf65fc 100644
--- a/extras/source/templates/presnt/Freshes/content.xml
+++ b/extras/source/templates/presnt/Freshes/content.xml
@@ -15,7 +15,7 @@
<style:graphic-properties style:protect="size"/>
</style:style>
<style:style style:name="gr4" style:family="graphic"
style:parent-style-name="Filled">
- <style:graphic-properties draw:opacity="50%"/>
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"
draw:opacity="50%"/>
</style:style>
<style:style style:name="gr9" style:family="graphic"
style:parent-style-name="Object_20_with_20_no_20_fill_20_and_20_no_20_line">
<style:graphic-properties draw:stroke="none" draw:fill="none"
draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle"
loext:glow-radius="0cm" loext:glow-transparency="90%"
draw:color-mode="standard" draw:luminance="0%" draw:contrast="0%"
draw:gamma="100%" draw:red="0%" draw:green="0%" draw:blue="0%"
fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:image-opacity="100%"
style:mirror="none"/>
@@ -26,11 +26,28 @@
<style:style style:name="gr26" style:family="graphic"
style:parent-style-name="Object_20_with_20_no_20_fill_20_and_20_no_20_line">
<style:graphic-properties draw:textarea-horizontal-align="center"
draw:textarea-vertical-align="middle" draw:ole-draw-aspect="1"/>
</style:style>
+ <style:style style:name="gr30" style:family="graphic"
style:parent-style-name="Outlined_20_Blue">
+ <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.1cm"
svg:stroke-color="#0d84a1" svg:stroke-linecap="round" draw:fill="solid"
draw:fill-color="#ffffff" draw:textarea-horizontal-align="center"
draw:textarea-vertical-align="middle" draw:auto-grow-height="false"/>
+ <style:text-properties fo:color="#0d84a1" loext:opacity="100%"/>
+ </style:style>
<style:style style:name="gr31" style:family="graphic"
style:parent-style-name="Outlined_20_Blue">
- <style:graphic-properties svg:stroke-width="0.85cm"
draw:marker-start-width="1.475cm" draw:marker-end-width="1.475cm"
draw:stroke-linejoin="round" draw:fill="none" draw:opacity="100%"
draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle"
draw:auto-grow-height="false" fo:padding-top="0.2cm" fo:padding-bottom="0.2cm"
fo:padding-left="0.2cm" fo:padding-right="0.2cm"/>
+ <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.85cm"
svg:stroke-color="#0d84a1" svg:stroke-linecap="round"
draw:marker-start-width="1.475cm" draw:marker-end-width="1.475cm"
draw:stroke-linejoin="round" draw:fill="none" draw:opacity="100%"
draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle"
draw:auto-grow-height="false" fo:padding-top="0.2cm" fo:padding-bottom="0.2cm"
fo:padding-left="0.2cm" fo:padding-right="0.2cm"/>
+ <style:text-properties fo:color="#0d84a1" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="gr32" style:family="graphic"
style:parent-style-name="Outlined">
+ <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.1cm"
svg:stroke-color="#ffffff" svg:stroke-linecap="round" draw:fill="solid"
draw:fill-color="#ffffff"/>
+ <style:text-properties fo:color="#0d84a1" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="gr33" style:family="graphic"
style:parent-style-name="Filled">
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
+ <style:text-properties fo:color="#0d84a1" loext:opacity="100%"/>
</style:style>
<style:style style:name="gr34" style:family="graphic"
style:parent-style-name="Outlined_20_Blue">
- <style:graphic-properties draw:marker-start="Circle"
draw:marker-start-width="0.36cm" draw:marker-end-width="0.36cm"/>
+ <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.1cm"
svg:stroke-color="#0d84a1" svg:stroke-linecap="round"
draw:marker-start="Circle" draw:marker-start-width="0.36cm"
draw:marker-end-width="0.36cm"/>
+ <style:text-properties fo:color="#0d84a1" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="gr35" style:family="graphic"
style:parent-style-name="Filled_20_Blue">
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#0d84a1"/>
</style:style>
<style:style style:name="co1" style:family="table-column">
<style:table-column-properties style:column-width="11.4cm"
style:use-optimal-column-width="false"/>
@@ -59,14 +76,14 @@
</style:style>
<style:style style:name="P52" style:family="paragraph">
<loext:graphic-properties draw:fill="none" draw:opacity="100%"/>
- <style:text-properties fo:font-size="54pt" fo:font-weight="bold"
style:font-size-asian="54pt" style:font-weight-asian="bold"
style:font-size-complex="54pt" style:font-weight-complex="bold"/>
+ <style:text-properties fo:color="#0d84a1" loext:opacity="100%"
fo:font-size="54pt" fo:font-weight="bold" style:font-size-asian="54pt"
style:font-weight-asian="bold" style:font-size-complex="54pt"
style:font-weight-complex="bold"/>
</style:style>
</office:automatic-styles>
<office:body>
<office:presentation>
<draw:page draw:name="page1" draw:style-name="dp1"
draw:master-page-name="Freshes"
presentation:presentation-page-layout-name="AL1T0" xml:id="id7" draw:id="id7">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:line draw:style-name="Outlined" draw:layer="layout" svg:x1="2cm"
svg:y1="8.9cm" svg:x2="20.4cm" svg:y2="8.9cm"/>
+ <draw:line draw:style-name="gr32" draw:layer="layout" svg:x1="2cm"
svg:y1="8.9cm" svg:x2="20.4cm" svg:y2="8.9cm"/>
<draw:frame presentation:style-name="Freshes-title"
draw:layer="layout" svg:width="24cm" svg:height="7cm" svg:x="2cm" svg:y="1.6cm"
presentation:class="title" presentation:placeholder="true">
<draw:text-box/>
</draw:frame>
@@ -89,7 +106,7 @@
</draw:page>
<draw:page draw:name="page2" draw:style-name="dp1"
draw:master-page-name="One_20_Bullet"
presentation:presentation-page-layout-name="AL1T0" xml:id="id8" draw:id="id8">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:path draw:style-name="Filled" draw:layer="layout"
svg:width="5.335cm" svg:height="4.127cm" svg:x="11.327cm" svg:y="2cm"
svg:viewBox="0 0 5336 4128" svg:d="M0 2670c0-66 22-116 66-151 34-37 84-56
150-56h513c59 0 109 19 148 59 39 39 59 88 59 148 0 59-21 109-62 150-40 41-89
61-145 61h-513c-59 0-110-20-153-61-42-41-63-91-63-150zM226 3917c0-57 22-107
66-151 40-37 90-56 150-56h4457c59 0 109 19 150 59 41 39 61 87 61 145s-20 108-61
151c-41 42-91 63-150 63h-4457c-60 0-111-20-153-61s-63-91-63-150zM729 936c0-63
19-112 56-146 41-44 91-66 151-66 59 0 109 22 150 66l353 357c44 41 66 89 66 146
0 62-20 113-59 153-39 39-89 58-148 58-54
0-102-20-146-61l-367-357c-37-34-56-85-56-150zM1363 2671c0 213 44 404 132 574 6
21 27 32 61 32h405c19 0 31-5 35-16 5-11 0-24-16-40-132-160-197-343-197-550
0-245 87-453 263-624 175-171 384-256 625-256 245 0 452 85 623 256s256 379 256
624c0 210-64 393-193 550-9 16-14 25-14 28 0 6 3 13 7 19 5 6 14 9 26 9h413c22 0
40-11 52-32 91-173 136-364 136-574 0-236-59-453
-176-654-118-201-277-360-477-477-201-118-419-177-654-177s-453 59-653 177c-201
117-360 276-477 477-118 201-177 418-177 654zM2460 729v-513c0-59 20-110 61-152
40-43 90-64 148-64s109 21 152 64c44 42 66 93 66 152v513c0 59-22 110-66 152-43
43-94 64-152 64s-108-21-148-64c-41-42-61-93-61-152zM3836 1293c0-60 21-108
62-146l352-357c41-44 91-66 151-66 62 0 113 20 152 61s59 91 59 151c0 62-17
113-52 150l-371 357c-41 38-89 57-146 57-62
0-112-19-150-57-38-37-57-87-57-150zM4405 2670c0-66 21-116 61-151 35-37 82-56
141-56h513c59 0 110 19 152 59 43 39 64 88 64 148 0 59-21 109-64 150-42 41-93
61-152 61h-513c-56 0-104-20-143-61s-59-91-59-150z"/>
+ <draw:path draw:style-name="gr33" draw:layer="layout"
svg:width="5.335cm" svg:height="4.127cm" svg:x="11.327cm" svg:y="2cm"
svg:viewBox="0 0 5336 4128" svg:d="M0 2670c0-66 22-116 66-151 34-37 84-56
150-56h513c59 0 109 19 148 59 39 39 59 88 59 148 0 59-21 109-62 150-40 41-89
61-145 61h-513c-59 0-110-20-153-61-42-41-63-91-63-150zM226 3917c0-57 22-107
66-151 40-37 90-56 150-56h4457c59 0 109 19 150 59 41 39 61 87 61 145s-20 108-61
151c-41 42-91 63-150 63h-4457c-60 0-111-20-153-61s-63-91-63-150zM729 936c0-63
19-112 56-146 41-44 91-66 151-66 59 0 109 22 150 66l353 357c44 41 66 89 66 146
0 62-20 113-59 153-39 39-89 58-148 58-54
0-102-20-146-61l-367-357c-37-34-56-85-56-150zM1363 2671c0 213 44 404 132 574 6
21 27 32 61 32h405c19 0 31-5 35-16 5-11 0-24-16-40-132-160-197-343-197-550
0-245 87-453 263-624 175-171 384-256 625-256 245 0 452 85 623 256s256 379 256
624c0 210-64 393-193 550-9 16-14 25-14 28 0 6 3 13 7 19 5 6 14 9 26 9h413c22 0
40-11 52-32 91-173 136-364 136-574 0-236-59-453-1
76-654-118-201-277-360-477-477-201-118-419-177-654-177s-453 59-653 177c-201
117-360 276-477 477-118 201-177 418-177 654zM2460 729v-513c0-59 20-110 61-152
40-43 90-64 148-64s109 21 152 64c44 42 66 93 66 152v513c0 59-22 110-66 152-43
43-94 64-152 64s-108-21-148-64c-41-42-61-93-61-152zM3836 1293c0-60 21-108
62-146l352-357c41-44 91-66 151-66 62 0 113 20 152 61s59 91 59 151c0 62-17
113-52 150l-371 357c-41 38-89 57-146 57-62
0-112-19-150-57-38-37-57-87-57-150zM4405 2670c0-66 21-116 61-151 35-37 82-56
141-56h513c59 0 110 19 152 59 43 39 64 88 64 148 0 59-21 109-64 150-42 41-93
61-152 61h-513c-56 0-104-20-143-61s-59-91-59-150z"/>
<draw:frame presentation:style-name="One_20_Bullet-title"
draw:layer="layout" svg:width="25cm" svg:height="2cm" svg:x="1.5cm"
svg:y="6.5cm" presentation:class="title" presentation:placeholder="true">
<draw:text-box/>
</draw:frame>
@@ -118,11 +135,11 @@
<draw:frame presentation:style-name="Two_20_Bullets-title"
draw:layer="backgroundobjects" svg:width="15cm" svg:height="2.629cm"
svg:x="12cm" svg:y="2cm" presentation:class="title"
presentation:placeholder="true" presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.111cm" svg:height="1.269cm" svg:x="14.123cm" svg:y="5.969cm"
svg:viewBox="0 0 1112 1270" svg:d="M871 320c65 12 118 46 159 104 36 51 61 116
74 194 12 71 11 142-2 213-20 117-60 216-119 295-71 96-160 144-268 144-26
0-55-8-87-25-21-13-45-20-72-20-26 0-50 7-72 20-31 17-60 25-86 25-108
0-197-48-268-144-60-79-100-178-119-295-14-71-14-142-3-213 13-78 38-143 75-194
41-58 94-92 158-104 40-7 95-1 164 17 59 17 110 37 151 60 42-23 92-43 152-60
69-18 124-24 163-17zM735 218c-23 22-54 37-92 47-26 9-55 13-87
13l-37-3c-3-23-3-49 0-79 7-60 26-105 57-136 23-22 54-38 92-48 26-8 55-12
87-12l37 2 2 38c0 31-4 60-12 87-10 38-26 68-47 91z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.111cm" svg:height="1.269cm" svg:x="14.123cm" svg:y="5.969cm"
svg:viewBox="0 0 1112 1270" svg:d="M871 320c65 12 118 46 159 104 36 51 61 116
74 194 12 71 11 142-2 213-20 117-60 216-119 295-71 96-160 144-268 144-26
0-55-8-87-25-21-13-45-20-72-20-26 0-50 7-72 20-31 17-60 25-86 25-108
0-197-48-268-144-60-79-100-178-119-295-14-71-14-142-3-213 13-78 38-143 75-194
41-58 94-92 158-104 40-7 95-1 164 17 59 17 110 37 151 60 42-23 92-43 152-60
69-18 124-24 163-17zM735 218c-23 22-54 37-92 47-26 9-55 13-87
13l-37-3c-3-23-3-49 0-79 7-60 26-105 57-136 23-22 54-38 92-48 26-8 55-12
87-12l37 2 2 38c0 31-4 60-12 87-10 38-26 68-47 91z"/>
<draw:frame presentation:style-name="Two_20_Bullets-outline1"
draw:layer="layout" svg:width="11.25cm" svg:height="5cm" svg:x="15.7cm"
svg:y="5cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.226cm" svg:height="0.963cm" svg:x="14.222cm" svg:y="11.37cm"
svg:viewBox="0 0 1227 964" svg:d="M864 425c8-8 12-18
12-30s-4-22-12-31c-9-9-19-13-32-13-59 0-114 6-166 18-51 12-99 30-144 55-45
24-87 53-125 85-39 33-79 72-121 118-8 10-13 20-13 30 0 13 4 23 13 31 9 9 19 13
30 13s22-4 31-13c13-10 30-27 51-48 21-22 37-37 46-46 63-56 125-96 184-120 60-24
131-36 214-36 13 0 23-4 32-13zM1227 259c0 43-5 87-14 132-39 194-163 343-371
446-97 49-198 74-300 74-66 0-132-10-196-32-7-3-27-12-60-29-34-17-56-25-66-25-7
0-16 7-27 22-10 14-20 30-30 47-10 18-22 34-36 48-15 15-28 22-42 22-19
0-33-4-43-12s-20-21-31-41c-1-1-3-4-4-7-2-3-3-5-4-6-1-2-2-4-2-7-1-2-1-6-1-10
0-16 7-32 21-50 14-17 30-32 47-45 17-12 32-25 46-38s21-25
21-33c0-2-3-11-9-26-6-16-10-26-11-30-4-23-6-46-6-71 0-53 10-104 30-151 20-48
47-90 81-127 34-36 73-68 117-95 43-27 90-49 139-65 25-8 58-14 100-18 41-3 82-5
122-6 41 0 82-2 123-4s78-7 112-16 60-22 78-39c4-4
11-11 20-20s15-15 20-19 11-8 19-13c8-6 16-9 25-12 9-2 19-3 30-3 17 0 33 11 48
32 14 21 25 46 32 76s13 59 16 85c4 26 6 48 6 66z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.226cm" svg:height="0.963cm" svg:x="14.222cm" svg:y="11.37cm"
svg:viewBox="0 0 1227 964" svg:d="M864 425c8-8 12-18
12-30s-4-22-12-31c-9-9-19-13-32-13-59 0-114 6-166 18-51 12-99 30-144 55-45
24-87 53-125 85-39 33-79 72-121 118-8 10-13 20-13 30 0 13 4 23 13 31 9 9 19 13
30 13s22-4 31-13c13-10 30-27 51-48 21-22 37-37 46-46 63-56 125-96 184-120 60-24
131-36 214-36 13 0 23-4 32-13zM1227 259c0 43-5 87-14 132-39 194-163 343-371
446-97 49-198 74-300 74-66 0-132-10-196-32-7-3-27-12-60-29-34-17-56-25-66-25-7
0-16 7-27 22-10 14-20 30-30 47-10 18-22 34-36 48-15 15-28 22-42 22-19
0-33-4-43-12s-20-21-31-41c-1-1-3-4-4-7-2-3-3-5-4-6-1-2-2-4-2-7-1-2-1-6-1-10
0-16 7-32 21-50 14-17 30-32 47-45 17-12 32-25 46-38s21-25
21-33c0-2-3-11-9-26-6-16-10-26-11-30-4-23-6-46-6-71 0-53 10-104 30-151 20-48
47-90 81-127 34-36 73-68 117-95 43-27 90-49 139-65 25-8 58-14 100-18 41-3 82-5
122-6 41 0 82-2 123-4s78-7 112-16 60-22 78-39c4-4 11-11 20-
20s15-15 20-19 11-8 19-13c8-6 16-9 25-12 9-2 19-3 30-3 17 0 33 11 48 32 14 21
25 46 32 76s13 59 16 85c4 26 6 48 6 66z"/>
<draw:frame presentation:style-name="Two_20_Bullets-outline1"
draw:layer="layout" svg:width="11.25cm" svg:height="5cm" svg:x="15.75cm"
svg:y="10.2cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
@@ -142,15 +159,15 @@
</draw:page>
<draw:page draw:name="page4" draw:style-name="dp1"
draw:master-page-name="Three_20_Bullets"
presentation:presentation-page-layout-name="AL1T15" xml:id="id10"
draw:id="id10">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.114cm" svg:height="1.269cm" svg:x="4.522cm" svg:y="8.084cm"
svg:viewBox="0 0 1115 1270" svg:d="M1094 856c10 5 16 13 18 23 3 11 2 21-3
29l-40 67c-12 21-29 26-52 15l-82-50 15 65c3 10 2 19-3 28s-12 15-22 19l-37
10c-10 3-20 2-30-4s-16-14-17-24l-47-176-157-89v193l132 132c8 8 12 18 12 28 0
11-4 21-12 29l-28 27c-8 8-17 13-28 13s-20-5-26-13l-50-47v99c0 12-4 21-12 29-8
7-18 11-27 11h-80c-11 0-21-4-28-11-8-8-11-17-11-29v-99l-50 47c-8 8-18 13-29
13-10 0-19-5-26-13l-29-27c-9-8-13-18-13-29 0-10 4-19 13-26l134-134v-193l-157
89-47 176c-3 10-9 18-18 24-10 6-19 7-29
4l-37-10c-10-2-18-8-23-18s-6-19-5-29l18-65-82 50c-23 11-41
6-52-15l-40-67c-13-22-8-39
15-52l84-47-64-18c-12-3-20-9-25-18s-6-19-2-29l10-37c1-10 7-18 16-24 9-5 19-7
31-3l173 47 159-92-159-92-173 47c-12 4-22
2-31-3-9-6-15-14-16-24l-10-37c-4-10-3-20 2-29s13-15
25-18l64-18-84-47c-23-13-28-30-15-52l40-67c11-21 29-26 52-15l82
50-15-65c-3-6-4-13-1-19 2-7 6-13 10
-18s9-8 16-10l37-10c7-1 13-1 20 0 6 2 12 5 17 10s8 11 10 18l47 176 157
89v-193l-135-132c-6-8-10-18-10-28 0-11 4-21 10-29l30-27c18-20 37-20 55 0l50
47v-99c0-12 3-21 11-29 7-7 17-11 28-11h80c11 0 21 4 28 11 8 8 11 17 11
29v99l50-47c6-8 15-13 27-13s21 5 27 13l30 27c7 8 10 18 10 29 0 10-3 20-10
28l-134 132v193l157-89 47-176c1-10 7-18 17-24s20-7 30-4l37 10c10 4 17 10 22
19s6 18 3 28l-15 65 82-50c23-11 40-6 52 15l40 67c11 22 6 39-15 52l-85 47 65
18c11 3 20 9 25 18s5 19 2 29l-10 37c-1 10-7 18-16 24-9 5-19 7-31 3l-174-47-158
92 158 92 174-47c12-4 22-2 31 3 9 6 15 14 16 24l10 37c3 10 3 20-2 29s-14 15-25
18l-65 18z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.114cm" svg:height="1.269cm" svg:x="4.522cm" svg:y="8.084cm"
svg:viewBox="0 0 1115 1270" svg:d="M1094 856c10 5 16 13 18 23 3 11 2 21-3
29l-40 67c-12 21-29 26-52 15l-82-50 15 65c3 10 2 19-3 28s-12 15-22 19l-37
10c-10 3-20 2-30-4s-16-14-17-24l-47-176-157-89v193l132 132c8 8 12 18 12 28 0
11-4 21-12 29l-28 27c-8 8-17 13-28 13s-20-5-26-13l-50-47v99c0 12-4 21-12 29-8
7-18 11-27 11h-80c-11 0-21-4-28-11-8-8-11-17-11-29v-99l-50 47c-8 8-18 13-29
13-10 0-19-5-26-13l-29-27c-9-8-13-18-13-29 0-10 4-19 13-26l134-134v-193l-157
89-47 176c-3 10-9 18-18 24-10 6-19 7-29
4l-37-10c-10-2-18-8-23-18s-6-19-5-29l18-65-82 50c-23 11-41
6-52-15l-40-67c-13-22-8-39
15-52l84-47-64-18c-12-3-20-9-25-18s-6-19-2-29l10-37c1-10 7-18 16-24 9-5 19-7
31-3l173 47 159-92-159-92-173 47c-12 4-22
2-31-3-9-6-15-14-16-24l-10-37c-4-10-3-20 2-29s13-15
25-18l64-18-84-47c-23-13-28-30-15-52l40-67c11-21 29-26 52-15l82
50-15-65c-3-6-4-13-1-19 2-7 6-13 10-18s9-8 16
-10l37-10c7-1 13-1 20 0 6 2 12 5 17 10s8 11 10 18l47 176 157
89v-193l-135-132c-6-8-10-18-10-28 0-11 4-21 10-29l30-27c18-20 37-20 55 0l50
47v-99c0-12 3-21 11-29 7-7 17-11 28-11h80c11 0 21 4 28 11 8 8 11 17 11
29v99l50-47c6-8 15-13 27-13s21 5 27 13l30 27c7 8 10 18 10 29 0 10-3 20-10
28l-134 132v193l157-89 47-176c1-10 7-18 17-24s20-7 30-4l37 10c10 4 17 10 22
19s6 18 3 28l-15 65 82-50c23-11 40-6 52 15l40 67c11 22 6 39-15 52l-85 47 65
18c11 3 20 9 25 18s5 19 2 29l-10 37c-1 10-7 18-16 24-9 5-19 7-31 3l-174-47-158
92 158 92 174-47c12-4 22-2 31 3 9 6 15 14 16 24l10 37c3 10 3 20-2 29s-14 15-25
18l-65 18z"/>
<draw:frame presentation:style-name="Three_20_Bullets-outline1"
draw:layer="layout" svg:width="8.4cm" svg:height="5cm" svg:x="0.7cm"
svg:y="9.6cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.271cm" svg:height="1.11cm" svg:x="13.335cm" svg:y="8.237cm"
svg:viewBox="0 0 1272 1111" svg:d="M389 555c62 0 116 20 163 58 47 39 74 88 81
148 9 73-10 136-58 190-47 53-107 80-178 80-58
0-109-18-153-54-43-37-70-83-80-139-4-12-1-22 7-31s19-14 32-14h80c20 0 33 8 39
25 12 36 37 54 75 54 16 0 31-4 43-12 13-8 22-20 29-35 6-14 9-29
7-44-3-20-13-36-30-48-16-13-34-19-54-19h-352c-12
0-21-4-29-11-7-8-11-17-11-29v-79c0-12 4-21 11-29 8-7 17-11 29-11zM40 475c-12
0-21-3-29-11-7-7-11-17-11-28v-80c0-11 4-21 11-28 8-8 17-11 29-11h828c20 0 38-7
55-19 16-12 26-28 30-48 3-23-3-45-19-64s-36-28-61-28c-38 0-63 18-74 54-7 17-20
25-40 25h-79c-9 0-16-2-23-6-6-4-11-10-15-17-3-8-4-15-2-21 8-42 26-79 53-111
28-32 62-55 103-69 42-14 85-17 129-8 45 9 84 31 117 64s54 72 64 116c15 76-1
144-49 202-48 59-109 88-184 88zM992 555c89 0 162 35 218 104 57 70 74 150 53
241-12 49-37 93-76 131s-84 62-135 72c-71 17-137 7-196-28-60-36-101-86-124-
150-5-14-4-26 5-36 8-11 19-17 32-17h84c17 0 28 7 35 20 23 40 58 60 104 60 33 0
61-12 85-35 23-23 34-51
34-84s-11-61-34-84c-24-23-52-35-85-35h-288c-18-63-51-116-99-159z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.271cm" svg:height="1.11cm" svg:x="13.335cm" svg:y="8.237cm"
svg:viewBox="0 0 1272 1111" svg:d="M389 555c62 0 116 20 163 58 47 39 74 88 81
148 9 73-10 136-58 190-47 53-107 80-178 80-58
0-109-18-153-54-43-37-70-83-80-139-4-12-1-22 7-31s19-14 32-14h80c20 0 33 8 39
25 12 36 37 54 75 54 16 0 31-4 43-12 13-8 22-20 29-35 6-14 9-29
7-44-3-20-13-36-30-48-16-13-34-19-54-19h-352c-12
0-21-4-29-11-7-8-11-17-11-29v-79c0-12 4-21 11-29 8-7 17-11 29-11zM40 475c-12
0-21-3-29-11-7-7-11-17-11-28v-80c0-11 4-21 11-28 8-8 17-11 29-11h828c20 0 38-7
55-19 16-12 26-28 30-48 3-23-3-45-19-64s-36-28-61-28c-38 0-63 18-74 54-7 17-20
25-40 25h-79c-9 0-16-2-23-6-6-4-11-10-15-17-3-8-4-15-2-21 8-42 26-79 53-111
28-32 62-55 103-69 42-14 85-17 129-8 45 9 84 31 117 64s54 72 64 116c15 76-1
144-49 202-48 59-109 88-184 88zM992 555c89 0 162 35 218 104 57 70 74 150 53
241-12 49-37 93-76 131s-84 62-135 72c-71 17-137
7-196-28-60-36-101-86-124-150-5-14-4
-26 5-36 8-11 19-17 32-17h84c17 0 28 7 35 20 23 40 58 60 104 60 33 0 61-12
85-35 23-23 34-51
34-84s-11-61-34-84c-24-23-52-35-85-35h-288c-18-63-51-116-99-159z"/>
<draw:frame presentation:style-name="Three_20_Bullets-outline1"
draw:layer="layout" svg:width="8.4cm" svg:height="5cm" svg:x="9.8cm"
svg:y="9.6cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.269cm" svg:height="1.11cm" svg:x="22.233cm" svg:y="8.276cm"
svg:viewBox="0 0 1270 1111" svg:d="M159 159c154 0 285 54 393 162 108 109 162
240 162 393v358c0 11-3 21-11 28-7 8-17 11-28 11h-80c-11
0-21-3-28-11-8-7-11-17-11-28v-358c-154
0-285-54-394-162-108-108-162-239-162-393zM1111 0h159c0 142-48 266-144 372s-214
166-355 181c-26-101-75-190-146-268 25-43 54-82 88-116 34-35 72-65 113-90 41-24
86-44 135-58s99-21 150-21z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.269cm" svg:height="1.11cm" svg:x="22.233cm" svg:y="8.276cm"
svg:viewBox="0 0 1270 1111" svg:d="M159 159c154 0 285 54 393 162 108 109 162
240 162 393v358c0 11-3 21-11 28-7 8-17 11-28 11h-80c-11
0-21-3-28-11-8-7-11-17-11-28v-358c-154
0-285-54-394-162-108-108-162-239-162-393zM1111 0h159c0 142-48 266-144 372s-214
166-355 181c-26-101-75-190-146-268 25-43 54-82 88-116 34-35 72-65 113-90 41-24
86-44 135-58s99-21 150-21z"/>
<draw:frame presentation:style-name="Three_20_Bullets-outline1"
draw:layer="layout" svg:width="8.4cm" svg:height="5cm" svg:x="18.9cm"
svg:y="9.6cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
@@ -173,19 +190,19 @@
</draw:page>
<draw:page draw:name="page5" draw:style-name="dp1"
draw:master-page-name="Four_20_Bullets"
presentation:presentation-page-layout-name="AL1T18" xml:id="id11"
draw:id="id11">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.229cm" svg:height="1.229cm" svg:x="4.083cm" svg:y="4.242cm"
svg:viewBox="0 0 1230 1230" svg:d="M526 5c-3 127-40 236-109 327l-194-193c88-73
189-117 303-134zM615 531l-114-114c94-116 142-255 144-417 137 7 258 53 362
139zM139 223l193 194c-91 69-200 106-327 109 17-114 61-215 134-303zM814
729l-114-114 391-392c86 104 133 225 139 362-162 4-301 52-416 144zM615 699l114
115c-92 115-140 254-144 416-137-6-258-53-362-139zM1091 1007l-193-193c91-70
200-106 327-110-16 115-61 215-134 303zM417 501l114 114-392
392c-86-104-132-225-139-362 162-2 301-50 417-144zM704 1225c4-127 40-236
110-327l193 193c-88 73-188 118-303 134z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.229cm" svg:height="1.229cm" svg:x="4.083cm" svg:y="4.242cm"
svg:viewBox="0 0 1230 1230" svg:d="M526 5c-3 127-40 236-109 327l-194-193c88-73
189-117 303-134zM615 531l-114-114c94-116 142-255 144-417 137 7 258 53 362
139zM139 223l193 194c-91 69-200 106-327 109 17-114 61-215 134-303zM814
729l-114-114 391-392c86 104 133 225 139 362-162 4-301 52-416 144zM615 699l114
115c-92 115-140 254-144 416-137-6-258-53-362-139zM1091 1007l-193-193c91-70
200-106 327-110-16 115-61 215-134 303zM417 501l114 114-392
392c-86-104-132-225-139-362 162-2 301-50 417-144zM704 1225c4-127 40-236
110-327l193 193c-88 73-188 118-303 134z"/>
<draw:frame presentation:style-name="Four_20_Bullets-outline1"
draw:layer="layout" svg:width="7.5cm" svg:height="3.7cm" svg:x="0.8cm"
svg:y="5.6cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.229cm" svg:height="1.229cm" svg:x="4.083cm" svg:y="10.084cm"
svg:viewBox="0 0 1230 1230" svg:d="M1196 129c21 86 33 173 34 260l-389-389c89 2
176 14 260 37 50 13 81 44 95 92zM35 1101c-22-86-33-172-35-260l389
389c-89-1-176-14-260-37-50-13-81-44-94-92zM10 682c28-183 105-335 231-455
125-120 273-192 444-217l535 538c-28 184-105 335-230 455-126 120-274 193-444
217zM799 377l-72 69-70-69c-10-10-19-10-27 0l-30 27c-8 10-8 20 0 30l72 70-57
57-69-72c-10-9-20-9-30 0l-27 27c-10 10-10 20 0 30l69 69-54
57-72-72c-9-8-18-8-28 0l-27 30c-10 8-10 17 0 27l69 70-69 72c-10 8-10 17 0 27l27
27c10 10 19 10 28 0l72-69 69 69c10 10 19 10 27 0l30-27c8-10 8-19 0-27l-72-72
57-55 70 70c10 10 19 10 29 0l28-28c10-10 10-19 0-29l-70-70 55-57 72 72c8 8 17 8
27 0l27-30c10-8 10-17 0-27l-69-69 69-72c10-9 10-18 0-28l-27-27c-10-10-19-10-27
0z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.229cm" svg:height="1.229cm" svg:x="4.083cm" svg:y="10.084cm"
svg:viewBox="0 0 1230 1230" svg:d="M1196 129c21 86 33 173 34 260l-389-389c89 2
176 14 260 37 50 13 81 44 95 92zM35 1101c-22-86-33-172-35-260l389
389c-89-1-176-14-260-37-50-13-81-44-94-92zM10 682c28-183 105-335 231-455
125-120 273-192 444-217l535 538c-28 184-105 335-230 455-126 120-274 193-444
217zM799 377l-72 69-70-69c-10-10-19-10-27 0l-30 27c-8 10-8 20 0 30l72 70-57
57-69-72c-10-9-20-9-30 0l-27 27c-10 10-10 20 0 30l69 69-54
57-72-72c-9-8-18-8-28 0l-27 30c-10 8-10 17 0 27l69 70-69 72c-10 8-10 17 0 27l27
27c10 10 19 10 28 0l72-69 69 69c10 10 19 10 27 0l30-27c8-10 8-19 0-27l-72-72
57-55 70 70c10 10 19 10 29 0l28-28c10-10 10-19 0-29l-70-70 55-57 72 72c8 8 17 8
27 0l27-30c10-8 10-17 0-27l-69-69 69-72c10-9 10-18 0-28l-27-27c-10-10-19-10-27
0z"/>
<draw:frame presentation:style-name="Four_20_Bullets-outline1"
draw:layer="layout" svg:width="7.5cm" svg:height="3.7cm" svg:x="9.1cm"
svg:y="5.6cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.229cm" svg:height="1.229cm" svg:x="11.957cm" svg:y="4.203cm"
svg:viewBox="0 0 1230 1230" svg:d="M913 883c31 65 74 122 129 174-119 115-261
173-427 173-165 0-307-58-426-173 52-52 95-109 129-174l-72-35c-29 55-66 105-112
152-89-113-134-241-134-385s45-272 134-384c46 44 83 94 109
149l72-38c-31-63-74-119-126-168 119-116 261-174 426-174 166 0 308 58 427 174-53
51-95 108-127 171l72 35c27-55 63-105 109-149 90 112 134 240 134 384s-45 272-136
385c-45-45-81-95-109-152zM347 804c42-128 42-255 0-382l-77 24c37 111 38 222 3
333zM883 422c-41 127-41 254 0 382l74-25c-34-109-33-220 3-333z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.229cm" svg:height="1.229cm" svg:x="11.957cm" svg:y="4.203cm"
svg:viewBox="0 0 1230 1230" svg:d="M913 883c31 65 74 122 129 174-119 115-261
173-427 173-165 0-307-58-426-173 52-52 95-109 129-174l-72-35c-29 55-66 105-112
152-89-113-134-241-134-385s45-272 134-384c46 44 83 94 109
149l72-38c-31-63-74-119-126-168 119-116 261-174 426-174 166 0 308 58 427 174-53
51-95 108-127 171l72 35c27-55 63-105 109-149 90 112 134 240 134 384s-45 272-136
385c-45-45-81-95-109-152zM347 804c42-128 42-255 0-382l-77 24c37 111 38 222 3
333zM883 422c-41 127-41 254 0 382l74-25c-34-109-33-220 3-333z"/>
<draw:frame presentation:style-name="Four_20_Bullets-outline1"
draw:layer="layout" svg:width="7.5cm" svg:height="3.7cm" svg:x="0.8cm"
svg:y="11.6cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
- <draw:path draw:style-name="Filled_20_Blue" draw:layer="layout"
svg:width="1.229cm" svg:height="1.229cm" svg:x="11.958cm" svg:y="10.044cm"
svg:viewBox="0 0 1230 1230" svg:d="M1050 180c120 120 180 265 180 435s-60
316-180 435c-119 120-265 180-435
180s-315-60-435-180c-120-119-180-265-180-435s60-315 180-435 265-180 435-180 316
60 435 180zM1111 615l-64 55-157-144 43-208 84 7c-64-89-148-150-251-181l35
77-186 104-186-104 35-77c-103 31-186 92-251 181l87-7 40 208-156 144-65-55c0 109
31 207 94 293l20-84 211 27 92 191-75 44c103 34 205 34 308 0l-74-44 91-191
211-27 20 84c63-86 94-184 94-293zM496 789l-74-228 193-139 194 139-75 228z"/>
+ <draw:path draw:style-name="gr35" draw:layer="layout"
svg:width="1.229cm" svg:height="1.229cm" svg:x="11.958cm" svg:y="10.044cm"
svg:viewBox="0 0 1230 1230" svg:d="M1050 180c120 120 180 265 180 435s-60
316-180 435c-119 120-265 180-435
180s-315-60-435-180c-120-119-180-265-180-435s60-315 180-435 265-180 435-180 316
60 435 180zM1111 615l-64 55-157-144 43-208 84 7c-64-89-148-150-251-181l35
77-186 104-186-104 35-77c-103 31-186 92-251 181l87-7 40 208-156 144-65-55c0 109
31 207 94 293l20-84 211 27 92 191-75 44c103 34 205 34 308 0l-74-44 91-191
211-27 20 84c63-86 94-184 94-293zM496 789l-74-228 193-139 194 139-75 228z"/>
<draw:frame presentation:style-name="Four_20_Bullets-outline1"
draw:layer="layout" svg:width="7.5cm" svg:height="3.7cm" svg:x="9.1cm"
svg:y="11.6cm" presentation:class="outline" presentation:placeholder="true"
presentation:user-transformed="true">
<draw:text-box/>
</draw:frame>
@@ -262,47 +279,47 @@
<draw:page draw:name="page8" draw:style-name="dp1"
draw:master-page-name="Diagram"
presentation:presentation-page-layout-name="AL3T19" xml:id="id14"
draw:id="id14">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
<draw:g>
- <draw:custom-shape draw:style-name="Outlined_20_Blue" xml:id="id1"
draw:id="id1" draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm"
svg:x="1.5cm" svg:y="8.7cm">
+ <draw:custom-shape draw:style-name="gr30" xml:id="id1" draw:id="id1"
draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm" svg:x="1.5cm"
svg:y="8.7cm">
<text:p>
<text:span>Lorem</text:span>
</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:mirror-horizontal="false" draw:mirror-vertical="false"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="Outlined_20_Blue" xml:id="id2"
draw:id="id2" draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm"
svg:x="10.4cm" svg:y="6.3cm">
+ <draw:custom-shape draw:style-name="gr30" xml:id="id2" draw:id="id2"
draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm" svg:x="10.4cm"
svg:y="6.3cm">
<text:p>
<text:span>Ipsum</text:span>
</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="Outlined_20_Blue" xml:id="id3"
draw:id="id3" draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm"
svg:x="10.4cm" svg:y="11.1cm">
+ <draw:custom-shape draw:style-name="gr30" xml:id="id3" draw:id="id3"
draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm" svg:x="10.4cm"
svg:y="11.1cm">
<text:p>
<text:span>Dolor</text:span>
</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="Outlined_20_Blue" xml:id="id5"
draw:id="id5" draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm"
svg:x="19.3cm" svg:y="1.5cm">
+ <draw:custom-shape draw:style-name="gr30" xml:id="id5" draw:id="id5"
draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm" svg:x="19.3cm"
svg:y="1.5cm">
<text:p>
<text:span>Sit Amet</text:span>
</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="Outlined_20_Blue" xml:id="id6"
draw:id="id6" draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm"
svg:x="19.3cm" svg:y="6.3cm">
+ <draw:custom-shape draw:style-name="gr30" xml:id="id6" draw:id="id6"
draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm" svg:x="19.3cm"
svg:y="6.3cm">
<text:p>
<text:span>Consectetur</text:span>
</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
- <draw:custom-shape draw:style-name="Outlined_20_Blue" xml:id="id4"
draw:id="id4" draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm"
svg:x="19.3cm" svg:y="11.1cm">
+ <draw:custom-shape draw:style-name="gr30" xml:id="id4" draw:id="id4"
draw:layer="layout" svg:width="6.4cm" svg:height="2.8cm" svg:x="19.3cm"
svg:y="11.1cm">
<text:p>
<text:span>Adipiscing</text:span>
</text:p>
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
- <draw:connector draw:style-name="Outlined_20_Blue"
draw:layer="layout" draw:type="lines" svg:x1="7.862cm" svg:y1="10.065cm"
svg:x2="10.406cm" svg:y2="7.705cm" draw:start-shape="id1"
draw:start-glue-point="1" draw:end-shape="id2" draw:end-glue-point="3"
svg:d="M7862 10065h553l1438-2360h553" svg:viewBox="0 0 2545 2361"/>
- <draw:connector draw:style-name="Outlined_20_Blue"
draw:layer="layout" draw:type="lines" svg:x1="7.862cm" svg:y1="10.065cm"
svg:x2="10.406cm" svg:y2="12.511cm" draw:start-shape="id1"
draw:start-glue-point="1" draw:end-shape="id3" draw:end-glue-point="3"
svg:d="M7862 10065h553l1438 2446h553" svg:viewBox="0 0 2545 2447"/>
- <draw:connector draw:style-name="Outlined_20_Blue"
draw:layer="layout" draw:type="lines" svg:x1="16.77cm" svg:y1="12.511cm"
svg:x2="19.314cm" svg:y2="12.511cm" draw:start-shape="id3"
draw:start-glue-point="1" draw:end-shape="id4" draw:end-glue-point="3"
svg:d="M16770 12511h553 1438 553" svg:viewBox="0 0 2545 1"/>
- <draw:connector draw:style-name="Outlined_20_Blue"
draw:layer="layout" draw:type="lines" svg:x1="16.77cm" svg:y1="7.705cm"
svg:x2="19.314cm" svg:y2="2.9cm" draw:start-shape="id2"
draw:start-glue-point="1" draw:end-shape="id5" draw:end-glue-point="3"
svg:d="M16770 7705h553l1438-4805h553" svg:viewBox="0 0 2545 4806"/>
- <draw:connector draw:style-name="Outlined_20_Blue"
draw:layer="layout" draw:type="lines" svg:x1="16.77cm" svg:y1="7.705cm"
svg:x2="19.314cm" svg:y2="7.705cm" draw:start-shape="id2"
draw:start-glue-point="1" draw:end-shape="id6" draw:end-glue-point="3"
svg:d="M16770 7705h553 1438 553" svg:viewBox="0 0 2545 1"/>
+ <draw:connector draw:style-name="gr30" draw:layer="layout"
draw:type="lines" svg:x1="7.862cm" svg:y1="10.065cm" svg:x2="10.406cm"
svg:y2="7.705cm" draw:start-shape="id1" draw:start-glue-point="1"
draw:end-shape="id2" draw:end-glue-point="3" svg:d="M7862
10065h553l1438-2360h553" svg:viewBox="0 0 2545 2361"/>
+ <draw:connector draw:style-name="gr30" draw:layer="layout"
draw:type="lines" svg:x1="7.862cm" svg:y1="10.065cm" svg:x2="10.406cm"
svg:y2="12.511cm" draw:start-shape="id1" draw:start-glue-point="1"
draw:end-shape="id3" draw:end-glue-point="3" svg:d="M7862 10065h553l1438
2446h553" svg:viewBox="0 0 2545 2447"/>
+ <draw:connector draw:style-name="gr30" draw:layer="layout"
draw:type="lines" svg:x1="16.77cm" svg:y1="12.511cm" svg:x2="19.314cm"
svg:y2="12.511cm" draw:start-shape="id3" draw:start-glue-point="1"
draw:end-shape="id4" draw:end-glue-point="3" svg:d="M16770 12511h553 1438 553"
svg:viewBox="0 0 2545 1"/>
+ <draw:connector draw:style-name="gr30" draw:layer="layout"
draw:type="lines" svg:x1="16.77cm" svg:y1="7.705cm" svg:x2="19.314cm"
svg:y2="2.9cm" draw:start-shape="id2" draw:start-glue-point="1"
draw:end-shape="id5" draw:end-glue-point="3" svg:d="M16770
7705h553l1438-4805h553" svg:viewBox="0 0 2545 4806"/>
+ <draw:connector draw:style-name="gr30" draw:layer="layout"
draw:type="lines" svg:x1="16.77cm" svg:y1="7.705cm" svg:x2="19.314cm"
svg:y2="7.705cm" draw:start-shape="id2" draw:start-glue-point="1"
draw:end-shape="id6" draw:end-glue-point="3" svg:d="M16770 7705h553 1438 553"
svg:viewBox="0 0 2545 1"/>
</draw:g>
<draw:frame presentation:style-name="Diagram-title"
draw:layer="layout" svg:width="25.2cm" svg:height="3cm" svg:x="1.4cm"
svg:y="0.6cm" presentation:class="title" presentation:placeholder="true">
<draw:text-box/>
diff --git a/extras/source/templates/presnt/Freshes/styles.xml
b/extras/source/templates/presnt/Freshes/styles.xml
index 78aef0f76f20..4db57b54ecb8 100644
--- a/extras/source/templates/presnt/Freshes/styles.xml
+++ b/extras/source/templates/presnt/Freshes/styles.xml
@@ -2210,14 +2210,25 @@
<style:graphic-properties draw:stroke="none" draw:fill="none"
draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle"
draw:color-mode="standard" draw:luminance="0%" draw:contrast="0%"
draw:gamma="100%" draw:red="0%" draw:green="0%" draw:blue="0%"
fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:image-opacity="100%"
style:mirror="horizontal" style:protect="position size"/>
</style:style>
<style:style style:name="Mgr5" style:family="graphic"
style:parent-style-name="Filled_20_Blue">
- <style:graphic-properties draw:opacity="45%" style:protect="position
size"/>
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#0d84a1"
draw:opacity="45%" style:protect="position size"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
</style:style>
<style:style style:name="Mgr6" style:family="graphic"
style:parent-style-name="Filled_20_Blue">
- <style:graphic-properties style:protect="position size"/>
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#0d84a1"
style:protect="position size"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
</style:style>
<style:style style:name="Mgr7" style:family="graphic"
style:parent-style-name="Object_20_with_20_no_20_fill_20_and_20_no_20_line">
<style:graphic-properties style:protect="position size"/>
</style:style>
+ <style:style style:name="Mgr8" style:family="graphic"
style:parent-style-name="Filled_20_Blue">
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#0d84a1"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Mgr9" style:family="graphic"
style:parent-style-name="Filled">
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
+ <style:text-properties fo:color="#000000" loext:opacity="100%"/>
+ </style:style>
+
<style:style style:name="Mpr2" style:family="presentation"
style:parent-style-name="Freshes-backgroundobjects">
<style:graphic-properties draw:textarea-vertical-align="bottom"/>
</style:style>
@@ -2709,7 +2720,7 @@
</style:master-page>
<style:master-page style:name="Blue_2f_White_20_Chart"
style:display-name="Blue/White Chart" style:page-layout-name="PM1"
draw:style-name="Mdp4">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:custom-shape draw:style-name="Filled"
draw:layer="backgroundobjects" svg:width="10cm" svg:height="1.6cm" svg:x="0cm"
svg:y="1cm">
+ <draw:custom-shape draw:style-name="Mgr9" draw:layer="backgroundobjects"
svg:width="10cm" svg:height="1.6cm" svg:x="0cm" svg:y="1cm">
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
<draw:frame presentation:style-name="Blue_2f_White_20_Chart-title"
draw:layer="backgroundobjects" svg:width="9.8cm" svg:height="2cm" svg:x="0cm"
svg:y="0.8cm" presentation:class="title" presentation:placeholder="true">
@@ -2791,7 +2802,7 @@
</style:master-page>
<style:master-page style:name="White_2f_Blue_20_Chart"
style:display-name="White/Blue Chart" style:page-layout-name="PM1"
draw:style-name="Mdp1">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:custom-shape draw:style-name="Filled_20_Blue"
draw:layer="backgroundobjects" svg:width="10cm" svg:height="1.6cm" svg:x="0cm"
svg:y="1cm">
+ <draw:custom-shape draw:style-name="Mgr8" draw:layer="backgroundobjects"
svg:width="10cm" svg:height="1.6cm" svg:x="0cm" svg:y="1cm">
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
<draw:frame presentation:style-name="White_2f_Blue_20_Chart-title"
draw:layer="backgroundobjects" svg:width="9.8cm" svg:height="2cm" svg:x="0cm"
svg:y="0.8cm" presentation:class="title" presentation:placeholder="true">
@@ -2954,8 +2965,8 @@
</style:master-page>
<style:master-page style:name="Table" style:page-layout-name="PM1"
draw:style-name="Mdp1">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:polygon draw:style-name="Filled_20_Blue"
draw:layer="backgroundobjects" svg:width="28cm" svg:height="4.571cm"
svg:x="0cm" svg:y="0cm" svg:viewBox="0 0 1000 1000" draw:points="0,1000 0,0
1000,0"/>
- <draw:polygon draw:style-name="Filled_20_Blue"
draw:layer="backgroundobjects" svg:width="16.6cm" svg:height="2.3cm"
svg:x="11.4cm" svg:y="13.45cm" svg:viewBox="0 0 1000 1000" draw:points="0,1000
1000,1000 1000,0"/>
+ <draw:polygon draw:style-name="Mgr8" draw:layer="backgroundobjects"
svg:width="28cm" svg:height="4.571cm" svg:x="0cm" svg:y="0cm" svg:viewBox="0 0
1000 1000" draw:points="0,1000 0,0 1000,0"/>
+ <draw:polygon draw:style-name="Mgr8" draw:layer="backgroundobjects"
svg:width="16.6cm" svg:height="2.3cm" svg:x="11.4cm" svg:y="13.45cm"
svg:viewBox="0 0 1000 1000" draw:points="0,1000 1000,1000 1000,0"/>
<draw:frame presentation:style-name="Table-title"
draw:layer="backgroundobjects" svg:width="25.2cm" svg:height="3cm"
svg:x="1.4cm" svg:y="0.6cm" presentation:class="title"
presentation:placeholder="true">
<draw:text-box/>
</draw:frame>
@@ -3035,7 +3046,7 @@
</style:master-page>
<style:master-page style:name="Left_20_Bar" style:display-name="Left Bar"
style:page-layout-name="PM1" draw:style-name="Mdp1">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:custom-shape draw:style-name="Filled_20_Blue"
draw:layer="backgroundobjects" svg:width="4.5cm" svg:height="15.75cm"
svg:x="0cm" svg:y="0cm">
+ <draw:custom-shape draw:style-name="Mgr8" draw:layer="backgroundobjects"
svg:width="4.5cm" svg:height="15.75cm" svg:x="0cm" svg:y="0cm">
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
<draw:frame presentation:style-name="Left_20_Bar-title"
draw:layer="backgroundobjects" svg:width="14cm" svg:height="3.5cm"
draw:transform="rotate (1.5707963267949) translate (0.5cm 14.75cm)"
presentation:class="title" presentation:placeholder="true">
@@ -3117,7 +3128,7 @@
</style:master-page>
<style:master-page style:name="Right_20_Bar" style:display-name="Right
Bar" style:page-layout-name="PM1" draw:style-name="Mdp1">
<office:forms form:automatic-focus="false"
form:apply-design-mode="false"/>
- <draw:custom-shape draw:style-name="Filled_20_Blue"
draw:layer="backgroundobjects" svg:width="4.5cm" svg:height="15.75cm"
svg:x="23.5cm" svg:y="0cm">
+ <draw:custom-shape draw:style-name="Mgr8" draw:layer="backgroundobjects"
svg:width="4.5cm" svg:height="15.75cm" svg:x="23.5cm" svg:y="0cm">
<draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
</draw:custom-shape>
<draw:frame presentation:style-name="Right_20_Bar-title"
draw:layer="backgroundobjects" svg:width="14cm" svg:height="3.5cm"
draw:transform="rotate (-1.5707963267949) translate (27.5cm 0.5cm)"
presentation:class="title" presentation:placeholder="true">
