From 9747d9a6ea954dfca4152d36fdb28a8b77fec84b Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Date: Thu, 25 May 2023 13:15:41 +0900
Subject: xmloff: rename theme color names and color-table to theme-colors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For ODF it's not needed to abbreviate names and we prefer to use
full names. The theme color names in OOXML are abbreviated and the
same names were used also for ODF - this was changed now.

"color-table" used in "theme" element has reused the already
existing "color-table" element name in ODF, but they don't relate
to each other. The name was changed to "theme-colors", which makes
more sense anyway.

Change-Id: I61ec91895d301ad4343f2b977d5cbcf38e360b99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152252
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
---
 .../OpenDocument-v1.3+libreoffice-schema.rng       | 28 +++++++++-------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'schema')

diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index 3de7acbb8cae..d56acc1668ca 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -3322,7 +3322,7 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
       <rng:empty/>
     </rng:element>
   </rng:define>
-  <rng:define name="loext-color-table-attlist">
+  <rng:define name="loext-theme-colors-attlist">
     <rng:interleave>
       <rng:optional>
         <rng:attribute name="loext:name">
@@ -3331,9 +3331,9 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
       </rng:optional>
     </rng:interleave>
   </rng:define>
-  <rng:define name="loext-color-table">
-    <rng:element name="loext:color-table">
-      <rng:ref name="loext-color-table-attlist"/>
+  <rng:define name="loext-theme-colors">
+    <rng:element name="loext:theme-colors">
+      <rng:ref name="loext-theme-colors-attlist"/>
       <rng:zeroOrMore>
         <rng:ref name="loext-color"/>
       </rng:zeroOrMore>
@@ -3352,7 +3352,7 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
     <rng:element name="loext:theme">
       <rng:ref name="loext-theme-attlist"/>
       <rng:optional>
-        <rng:ref name="loext-color-table"/>
+        <rng:ref name="loext-theme-colors"/>
       </rng:optional>
     </rng:element>
   </rng:define>
@@ -3465,24 +3465,18 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
   <!-- Theme Elements -->
   <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>dark1</rng:value>
+      <rng:value>light1</rng:value>
+      <rng:value>dark2</rng:value>
+      <rng:value>light2</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:value>hyperlink</rng:value>
+      <rng:value>followed-hyperlink</rng:value>
     </rng:choice>
   </rng:define>
 
-- 
cgit