diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-03-17 20:37:39 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-07-01 08:46:36 +0200 |
| commit | 1e93905e5136149d09b5c591e0fe2366d759f429 (patch) | |
| tree | edd14d9d7a57c83f3e28502187985e4653c620d8 /schema | |
| parent | b7b56e6031b77f23a3d8bd1431eae06df05c28c4 (diff) | |
sd theme: add ODP import/export for shape fill color
Refer to the 12 pre-defined colors by name + don't write the attribute
for the case when there is no theme.
(cherry picked from commit 1868dea877b0c956ee34e92afad59920e66cad3f)
Change-Id: I37c984b3371ec878a0d733977f5c937dce27c440
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136676
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'schema')
| -rw-r--r-- | schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng index 770ba54816f1..861b4481c1a6 100644 --- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng +++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng @@ -1762,6 +1762,12 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. <rng:ref name="color"/> </rng:attribute> </rng:optional> + <!-- TODO 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="draw:secondary-fill-color"> <rng:ref name="color"/> @@ -2258,29 +2264,10 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. <rng:ref name="zeroToHundredPercent"/> </rng:attribute> </rng:optional> - <!-- TODO no proposal --> + <!-- TODO no proposal for theme color of shape text --> <rng:optional> <rng:attribute name="loext:theme-color"> - <rng:choice> - <!-- Background 1 --> - <rng:value>dk1</rng:value> - <!-- Text 1 --> - <rng:value>lt1</rng:value> - <!-- Background 2 --> - <rng:value>dk2</rng:value> - <!-- Text 2 --> - <rng:value>lt2</rng:value> - <rng:value>accent1</rng:value> - <rng:value>accent2</rng:value> - <rng:value>accent3</rng:value> - <rng:value>accent4</rng:value> - <rng:value>accent5</rng:value> - <rng:value>accent6</rng:value> - <!-- Hyperlink --> - <rng:value>hlink</rng:value> - <!-- Followed hyperlink --> - <rng:value>folHlink</rng:value> - </rng:choice> + <rng:ref name="theme-color"/> </rng:attribute> </rng:optional> <rng:optional> @@ -3116,7 +3103,7 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. <rng:ref name="office-forms"/> </rng:optional> <rng:optional> - <!-- TODO no proposal --> + <!-- TODO no proposal for defining a theme --> <rng:ref name="loext-theme"/> </rng:optional> <rng:zeroOrMore> @@ -3130,4 +3117,26 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1. </rng:optional> </rng:element> </rng:define> + <rng:define name="theme-color"> + <rng:choice> + <!-- Background 1 --> + <rng:value>dk1</rng:value> + <!-- Text 1 --> + <rng:value>lt1</rng:value> + <!-- Background 2 --> + <rng:value>dk2</rng:value> + <!-- Text 2 --> + <rng:value>lt2</rng:value> + <rng:value>accent1</rng:value> + <rng:value>accent2</rng:value> + <rng:value>accent3</rng:value> + <rng:value>accent4</rng:value> + <rng:value>accent5</rng:value> + <rng:value>accent6</rng:value> + <!-- Hyperlink --> + <rng:value>hlink</rng:value> + <!-- Followed hyperlink --> + <rng:value>folHlink</rng:value> + </rng:choice> + </rng:define> </rng:grammar> |