extras/source/templates/presnt/Focus/styles.xml | 14 +++++++-------
extras/source/templates/presnt/Inspiration/styles.xml | 11 ++++++-----
2 files changed, 13 insertions(+), 12 deletions(-)
New commits:
commit 38160bc630567aa5d1384528516983ec17866edb
Author: Laurent BP <laurent.balland-poir...@laposte.net>
AuthorDate: Thu Sep 8 09:21:02 2022 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Sep 14 11:36:55 2022 +0200
tdf#135060 Modify Inspiration template
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: Iec0e87de4fa9f6cead971a97690bc17b62526a72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139631
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/extras/source/templates/presnt/Inspiration/styles.xml
b/extras/source/templates/presnt/Inspiration/styles.xml
index 5f0ee10d8015..1060504377dc 100644
--- a/extras/source/templates/presnt/Inspiration/styles.xml
+++ b/extras/source/templates/presnt/Inspiration/styles.xml
@@ -384,8 +384,8 @@
<style:style style:name="Mgr3" style:family="graphic"
style:parent-style-name="standard" style:list-style-name="ML1">
<style:graphic-properties draw:stroke="none"
draw:stroke-dash="Dashed_20__28_var_29__20_2" svg:stroke-width="0.03cm"
svg:stroke-color="#3f52d9" draw:marker-start-width="0.25cm"
draw:marker-end-width="0.25cm" draw:fill-color="#81aca6" draw:opacity="39%"
draw:textarea-vertical-align="middle" draw:auto-grow-height="false"
fo:min-height="0.4cm" fo:min-width="1.601cm" fo:padding-top="0.125cm"
fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm"
draw:shadow="visible" draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm"
draw:shadow-color="#b2b2b2" draw:shadow-opacity="100%"/>
</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"
fo:min-height="1.5cm" fo:min-width="24.31cm" draw:shadow-offset-x="0.035cm"
draw:shadow-offset-y="0.035cm" draw:shadow-color="#b2b2b2"
draw:shadow-opacity="43%" loext:shadow-blur="0.035cm" loext:glow-radius="0cm"
loext:softedge-radius="0cm"/>
+ <style:style style:name="Mgr4" style:family="graphic"
style:parent-style-name="standard">
+ <style:graphic-properties draw:textarea-vertical-align="middle"
fo:min-height="1.5cm" draw:shadow-offset-x="0.035cm"
draw:shadow-offset-y="0.035cm" draw:shadow-color="#b2b2b2"
draw:shadow-opacity="43%" loext:shadow-blur="0.035cm" loext:glow-radius="0cm"
loext:softedge-radius="0cm" svg:stroke-color="#91d93f" draw:fill="solid"
draw:fill-color="#b5e77d" draw:shadow="visible"/>
</style:style>
<style:style style:name="Mgr5" style:family="graphic"
style:parent-style-name="Accent_20_3">
<style:graphic-properties draw:textarea-vertical-align="middle"
fo:min-height="3cm" fo:min-width="2cm"/>
@@ -396,8 +396,8 @@
<style:style style:name="Mgr7" style:family="graphic"
style:parent-style-name="standard" style:list-style-name="ML1">
<style:graphic-properties draw:stroke="none"
draw:stroke-dash="Dashed_20__28_var_29__20_2" svg:stroke-width="0.03cm"
svg:stroke-color="#91d93f" draw:marker-start-width="0.25cm"
draw:marker-end-width="0.25cm" draw:fill-color="#b5e77d" draw:opacity="49%"
draw:textarea-vertical-align="middle" draw:auto-grow-height="false"
fo:min-height="1.01cm" fo:min-width="0.996cm" fo:padding-top="0.125cm"
fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm"
draw:shadow-offset-x="0.06cm" draw:shadow-offset-y="0.06cm"
draw:shadow-color="#dcf1c1"/>
</style:style>
- <style:style style:name="Mgr8" style:family="graphic"
style:parent-style-name="Accent_20_1">
- <style:graphic-properties draw:stroke="none"
draw:textarea-vertical-align="middle" fo:min-height="1.5cm"
fo:min-width="0.19cm" draw:shadow="hidden" draw:shadow-offset-x="0cm"
draw:shadow-offset-y="0cm" draw:shadow-color="#dddddd"
draw:shadow-opacity="100%" loext:shadow-blur="0cm" loext:glow-radius="0cm"
loext:softedge-radius="0cm"/>
+ <style:style style:name="Mgr8" style:family="graphic"
style:parent-style-name="standard">
+ <style:graphic-properties draw:stroke="none" draw:fill="solid"
draw:fill-color="#b5e77d" draw:textarea-vertical-align="middle"
fo:min-height="1.5cm" fo:min-width="0.19cm" draw:shadow="hidden"
draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm"
draw:shadow-color="#dddddd" draw:shadow-opacity="100%" loext:shadow-blur="0cm"
loext:glow-radius="0cm" loext:softedge-radius="0cm"/>
</style:style>
<style:style style:name="Mgr9" style:family="graphic"
style:parent-style-name="Accent_20_3">
<style:graphic-properties draw:stroke="none" draw:fill-color="#81aca6"
draw:textarea-vertical-align="middle" fo:min-height="0cm"
fo:min-width="2.013cm" draw:shadow="hidden" draw:shadow-offset-x="0cm"
draw:shadow-offset-y="0cm" draw:shadow-color="#b2b2b2"
draw:shadow-opacity="100%" loext:shadow-blur="0cm"/>
@@ -406,7 +406,8 @@
<style:graphic-properties draw:fill="solid" draw:fill-color="#666666"
draw:textarea-vertical-align="middle" draw:auto-grow-height="false"
fo:min-height="15.749cm" fo:min-width="28cm"/>
</style:style>
<style:style style:name="Mpr2" style:family="presentation"
style:parent-style-name="Inspiration-backgroundobjects">
- <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"
draw:textarea-vertical-align="middle" draw:auto-grow-height="false"
fo:min-height="13.5cm" fo:min-width="26.5cm" draw:shadow="visible"
loext:shadow-blur="0.106cm"/>
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"
draw:textarea-vertical-align="middle" draw:auto-grow-height="false"
fo:min-height="13.5cm" fo:min-width="26.5cm" draw:shadow="visible"
loext:shadow-blur="0.106cm" draw:stroke="none" draw:fill-image-width="0cm"
draw:fill-image-height="0cm" draw:textarea-horizontal-align="justify"
draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm"
draw:shadow-color="#808080"/>
+ <style:text-properties fo:color="#eeeeee" loext:opacity="100%"
style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'"
style:font-family-generic="roman" style:font-pitch="variable"
fo:font-size="14pt" style:letter-kerning="true" style:font-size-asian="14pt"
style:font-size-complex="14pt"/>
</style:style>
<style:style style:name="Mpr3" style:family="presentation"
style:parent-style-name="Inspiration-backgroundobjects">
<style:graphic-properties draw:stroke="none" draw:fill="none"
draw:fill-color="#ffffff" draw:auto-grow-height="false"
fo:min-height="1.449cm"/>
commit a4226f8afc6c2e6026581b41f2149024f04cdf04
Author: Laurent BP <laurent.balland-poir...@laposte.net>
AuthorDate: Sun Sep 11 13:35:50 2022 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Sep 14 11:36:35 2022 +0200
tdf#135060 Modify Focus template
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.
Correct attribute error for asian font size
Change-Id: I6d1c8be24a156bce72a09604ab013fc0800b9f80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139767
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/extras/source/templates/presnt/Focus/styles.xml
b/extras/source/templates/presnt/Focus/styles.xml
index 447ef721b2e4..4d631baec3c1 100644
--- a/extras/source/templates/presnt/Focus/styles.xml
+++ b/extras/source/templates/presnt/Focus/styles.xml
@@ -778,7 +778,7 @@
</text:list-style>
</style:graphic-properties>
<style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0cm" fo:margin-bottom="0.374cm" fo:text-indent="0cm"/>
- <style:text-properties fo:font-variant="normal" fo:text-transform="none"
fo:color="#666666" loext:opacity="100%" style:text-outline="false"
style:text-line-through-style="none" style:text-line-through-type="none"
style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'"
style:font-style-name="Book" style:font-pitch="variable" fo:font-size="24pt"
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="24t"
style:font-style-asian="normal" style:font-weight-asian="normal"
style:font-size-complex="24pt" 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:text-properties fo:font-variant="normal" fo:text-transform="none"
fo:color="#666666" loext:opacity="100%" style:text-outline="false"
style:text-line-through-style="none" style:text-line-through-type="none"
style:font-name="DejaVu Sans2" fo:font-family="'DejaVu Sans'"
style:font-style-name="Book" style:font-pitch="variable" fo:font-size="24pt"
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="24pt" style:font-style-asian="normal"
style:font-weight-asian="normal" style:font-size-complex="24pt"
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="Focus3-outline2" style:family="presentation"
style:parent-style-name="Focus3-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"/>
@@ -934,22 +934,22 @@
<style:paragraph-properties style:writing-mode="lr-tb"/>
</style:style>
<style:style style:name="Mpr1" style:family="presentation"
style:parent-style-name="Focus-backgroundobjects">
- <style:graphic-properties draw:fill="solid" draw:fill-color="#f10d0c"
draw:textarea-vertical-align="middle"/>
+ <style:graphic-properties draw:stroke="none" draw:fill="solid"
draw:fill-color="#f10d0c" draw:textarea-vertical-align="middle"/>
</style:style>
<style:style style:name="Mpr2" style:family="presentation"
style:parent-style-name="Focus-backgroundobjects">
- <style:graphic-properties draw:fill="solid" draw:fill-color="#ea7500"
draw:textarea-vertical-align="middle"/>
+ <style:graphic-properties draw:stroke="none" draw:fill="solid"
draw:fill-color="#ea7500" draw:textarea-vertical-align="middle"/>
</style:style>
<style:style style:name="Mpr3" style:family="presentation"
style:parent-style-name="Focus-backgroundobjects">
- <style:graphic-properties draw:fill="solid" draw:fill-color="#e8a202"
draw:textarea-vertical-align="middle"/>
+ <style:graphic-properties draw:stroke="none" draw:fill="solid"
draw:fill-color="#e8a202" draw:textarea-vertical-align="middle"/>
</style:style>
<style:style style:name="Mpr4" style:family="presentation"
style:parent-style-name="Focus-backgroundobjects">
- <style:graphic-properties draw:fill="solid" draw:fill-color="#168253"
draw:textarea-vertical-align="middle"/>
+ <style:graphic-properties draw:stroke="none" draw:fill="solid"
draw:fill-color="#168253" draw:textarea-vertical-align="middle"/>
</style:style>
<style:style style:name="Mpr5" style:family="presentation"
style:parent-style-name="Focus-backgroundobjects">
- <style:graphic-properties draw:fill="solid" draw:fill-color="#3465a4"
draw:textarea-vertical-align="middle"/>
+ <style:graphic-properties draw:stroke="none" draw:fill="solid"
draw:fill-color="#3465a4" draw:textarea-vertical-align="middle"/>
</style:style>
<style:style style:name="Mpr6" style:family="presentation"
style:parent-style-name="Focus-backgroundobjects">
- <style:graphic-properties draw:fill="solid" draw:fill-color="#780373"
draw:textarea-vertical-align="middle"/>
+ <style:graphic-properties draw:stroke="none" draw:fill="solid"
draw:fill-color="#780373" draw:textarea-vertical-align="middle"/>
</style:style>
<style:style style:name="Mpr7" style:family="presentation"
style:parent-style-name="Focus-backgroundobjects">
<style:graphic-properties draw:stroke="none" draw:fill="none"
draw:fill-color="#ffffff" draw:auto-grow-height="false"
fo:min-height="1.449cm"/>
