diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2022-12-31 20:59:03 +0900 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-01-20 07:13:37 +0000 |
| commit | d58e3a0716a91e3d1360299a926c7060a47d0650 (patch) | |
| tree | 6e085404cd766672a7ee73821da7959a8c35e056 /schema/libreoffice | |
| parent | 8749a56d868f66fac2628720d7b40eeedddadc54 (diff) | |
xmloff: use XThemeColor in ODF, change the format for themes
Change the xmloff filter to use XThemeColor and the associated
proprties (CharColorThemeReference and FillColorThemeReference).
Change the ODF format for referencing a theme color - make it an
element instead a series of attributes on the *-properties style
element.
Change-Id: I0fa7d8ebffecc02897b7fe9824d6f1776ef36380
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144923
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 3eb53d327fb5d9689b799ff991a6c53c05eff496)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145846
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'schema/libreoffice')
| -rw-r--r-- | schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 88 |
1 files changed, 56 insertions, 32 deletions
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng index ee9b89ded8a9..8f94223903fe 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng @@ -1798,22 +1798,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. <rng:ref name="color"/> </rng:attribute> </rng:optional> - <!-- TODO(vmiklos) no proposal for theme color of shape fill --> - <rng:optional> - <rng:attribute name="loext:fill-theme-color"> - <rng:ref name="theme-color"/> - </rng:attribute> - </rng:optional> - <rng:optional> - <rng:attribute name="loext:fill-color-lum-mod"> - <rng:ref name="zeroToHundredPercent"/> - </rng:attribute> - </rng:optional> - <rng:optional> - <rng:attribute name="loext:fill-color-lum-off"> - <rng:ref name="zeroToHundredPercent"/> - </rng:attribute> - </rng:optional> <rng:optional> <rng:attribute name="draw:secondary-fill-color"> <rng:ref name="color"/> @@ -2310,22 +2294,6 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. <rng:ref name="zeroToHundredPercent"/> </rng:attribute> </rng:optional> - <!-- TODO(vmiklos) no proposal for theme color of shape text --> - <rng:optional> - <rng:attribute name="loext:theme-color"> - <rng:ref name="theme-color"/> - </rng:attribute> - </rng:optional> - <rng:optional> - <rng:attribute name="loext:color-lum-mod"> - <rng:ref name="zeroToHundredPercent"/> - </rng:attribute> - </rng:optional> - <rng:optional> - <rng:attribute name="loext:color-lum-off"> - <rng:ref name="zeroToHundredPercent"/> - </rng:attribute> - </rng:optional> </rng:define> <rng:define name="style-text-properties-attlist" combine="interleave"> @@ -3282,6 +3250,8 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:optional> </rng:element> </rng:define> + + <!-- Theme Elements --> <rng:define name="theme-color"> <rng:choice> <!-- Background 1 --> @@ -3306,6 +3276,60 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:define> <!-- TODO no proposal --> + <rng:define name="loext-transformation"> + <rng:element name="loext:transformation"> + <rng:attribute name="loext:type"> + <rng:ref name="string"/> + </rng:attribute> + <rng:attribute name="loext:value"> + <rng:ref name="integer"/> + </rng:attribute> + </rng:element> + </rng:define> + + <rng:define name="loext-theme-color-reference-attlist"> + <rng:interleave> + <rng:optional> + <rng:attribute name="loext:type"> + <rng:ref name="theme-color"/> + </rng:attribute> + </rng:optional> + </rng:interleave> + </rng:define> + + <rng:define name="loext-char-color-theme-reference"> + <rng:element name="loext:char-color-theme-reference"> + <rng:ref name="loext-theme-color-reference-attlist"/> + <rng:zeroOrMore> + <rng:ref name="loext-transformation"/> + </rng:zeroOrMore> + </rng:element> + </rng:define> + + <rng:define name="loext-fill-color-theme-reference"> + <rng:element name="loext:fill-color-theme-reference"> + <rng:ref name="loext-theme-color-reference-attlist"/> + <rng:zeroOrMore> + <rng:ref name="loext-transformation"/> + </rng:zeroOrMore> + </rng:element> + </rng:define> + + <!-- TODO no proposal --> + <rng:define name="style-text-properties-elements" combine="interleave"> + <rng:optional> + <rng:ref name="loext-char-color-theme-reference"/> + </rng:optional> + </rng:define> + + <!-- TODO no proposal --> + <rng:define name="style-graphic-properties-elements" combine="interleave"> + <rng:optional> + <rng:ref name="loext-fill-color-theme-reference"/> + </rng:optional> + </rng:define> + + <!-- https://issues.oasis-open.org/browse/OFFICE-4136 --> <rng:define name="draw-frame-attlist" combine="interleave"> <rng:optional> <rng:attribute name="loext:decorative"> |