summaryrefslogtreecommitdiff
path: root/schema
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-12-09 08:43:27 +0100
committerMiklos Vajna <vmiklos@collabora.com>2022-06-29 09:04:07 +0200
commitae2b901849bbc6a1a75ea3c9b855676617e0958e (patch)
tree6e63b27320e56ed008706c583698aa518e7ffedc /schema
parent3d210f998928cb00e6989d9c2ad64ef1fa699175 (diff)
ODP import/export: refer to theme from shape text 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 91f649a119d4b7ece26f9737a38663664953a57a) Conflicts: xmloff/source/token/tokens.txt Change-Id: Ib6ab5b7b34d896a36e04309bf0cb410998acce01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136527 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.rng25
1 files changed, 25 insertions, 0 deletions
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index 19a1edb7f3c0..b7c2d83b98e8 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -2258,6 +2258,31 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
<rng:ref name="zeroToHundredPercent"/>
</rng:attribute>
</rng:optional>
+ <!-- TODO no proposal -->
+ <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:attribute>
+ </rng:optional>
</rng:define>
<rng:define name="style-text-properties-attlist" combine="interleave">