xmloff: rename *-color-theme-reference to *-complex-color

Change-Id: I63dd83522da7699162eb06a019a679d4b8750d10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152053
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>

12 files changed, 61 insertions, 58 deletions

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index ad512edb86dc..2edbfac23f47 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3489,6 +3489,7 @@ namespace xmloff::token {
         XML_LINKED_STYLE_NAME,
 
         XML_THEME,
+        XML_THEME_TYPE,
         XML_CHAR_COMPLEX_COLOR,
         XML_FILL_COMPLEX_COLOR,
         XML_DK1,
diff --git a/oox/qa/unit/data/ReferenceShapeFill.fodp b/oox/qa/unit/data/ReferenceShapeFill.fodp
index 61111d406c32..09a231c0344d 100644
--- a/oox/qa/unit/data/ReferenceShapeFill.fodp
+++ b/oox/qa/unit/data/ReferenceShapeFill.fodp
@@ -350,28 +350,28 @@
    </style:graphic-properties>
    <style:paragraph-properties fo:margin-top="0.5cm" fo:margin-bottom="0cm" fo:line-height="90%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="28pt" fo:letter-spacing="normal" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-name-asian="Noto Sans CJK SC" style:font-family-asian="&apos;Noto Sans CJK SC&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="28pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="&apos;Droid Sans Devanagari&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="28pt" 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" fo:hyphenate="false">
-    <loext:char-color-theme-reference loext:type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dk1"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="Title_20_Slide-outline2" style:display-name="Title Slide-outline2" style:family="presentation" style:parent-style-name="Title_20_Slide-outline1">
    <style:graphic-properties style:writing-mode="lr-tb"/>
    <style:paragraph-properties fo:margin-top="0.4cm" fo:margin-bottom="0cm" fo:line-height="90%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="20pt" fo:letter-spacing="normal" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" fo:background-color="transparent" style:font-size-asian="20pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="20pt" style:font-style-complex="normal" style:font-weight-complex="normal" fo:hyphenate="false">
-    <loext:char-color-theme-reference loext:type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dk1"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="Title_20_Slide-outline3" style:display-name="Title Slide-outline3" style:family="presentation" style:parent-style-name="Title_20_Slide-outline2">
    <style:graphic-properties style:writing-mode="lr-tb"/>
    <style:paragraph-properties fo:margin-top="0.3cm" fo:margin-bottom="0cm" fo:line-height="90%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="18pt" fo:letter-spacing="normal" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" fo:background-color="transparent" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal" fo:hyphenate="false">
-    <loext:char-color-theme-reference loext:type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dk1"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="Title_20_Slide-outline4" style:display-name="Title Slide-outline4" style:family="presentation" style:parent-style-name="Title_20_Slide-outline3">
    <style:graphic-properties style:writing-mode="lr-tb"/>
    <style:paragraph-properties fo:margin-top="0.2cm" fo:margin-bottom="0cm" fo:line-height="90%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="18pt" fo:letter-spacing="normal" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" fo:background-color="transparent" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal" fo:hyphenate="false">
-    <loext:char-color-theme-reference loext:type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dk1"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="Title_20_Slide-outline5" style:display-name="Title Slide-outline5" style:family="presentation" style:parent-style-name="Title_20_Slide-outline4">
@@ -489,7 +489,7 @@
    </style:graphic-properties>
    <style:paragraph-properties fo:line-height="100%" fo:text-align="start" style:punctuation-wrap="hanging" style:writing-mode="lr-tb"/>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#000000" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-family="Calibri" fo:font-size="18pt" fo:letter-spacing="normal" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-name-asian="Noto Sans CJK SC" style:font-family-asian="&apos;Noto Sans CJK SC&apos;" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="&apos;Droid Sans Devanagari&apos;" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="18pt" 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" fo:hyphenate="false">
-    <loext:char-color-theme-reference loext:type="dk1"/>
+    <loext:char-complex-color loext:theme-type="dk1"/>
    </style:text-properties>
   </style:style>
   <style:presentation-page-layout style:name="AL0T26">
@@ -531,9 +531,9 @@
   </style:style>
   <style:style style:name="gr3" style:family="graphic" style:parent-style-name="standard" style:list-style-name="L3">
    <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.035cm" svg:stroke-color="#325490" draw:stroke-linejoin="miter" svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#548235" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" draw:fit-to-size="false" style:shrink-to-fit="false" fo:min-height="0cm" fo:min-width="0cm" fo:padding-top="0.125cm" fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm" fo:wrap-option="wrap" style:writing-mode="lr-tb">
-    <loext:fill-color-theme-reference loext:type="accent6">
+    <loext:fill-complex-color loext:theme-type="accent6">
      <loext:transformation loext:type="lummod" loext:value="7500"/>
-    </loext:fill-color-theme-reference>
+    </loext:fill-complex-color>
    </style:graphic-properties>
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
@@ -585,7 +585,7 @@
   </style:style>
   <style:style style:name="T2" style:family="text">
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#ffffff" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-size="18pt" fo:letter-spacing="normal" fo:language="en" fo:country="GB" fo:font-style="normal" style:text-underline-style="none" fo:font-weight="normal" fo:background-color="transparent" style:font-size-asian="18pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="18pt" style:font-style-complex="normal" style:font-weight-complex="normal">
-    <loext:char-color-theme-reference loext:type="lt1"/>
+    <loext:char-complex-color loext:theme-type="lt1"/>
    </style:text-properties>
   </style:style>
   <text:list-style style:name="L1">
@@ -835,4 +835,4 @@
    <presentation:settings presentation:mouse-visible="false"/>
   </office:presentation>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt b/oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt
index 44764541ba86..6f0da7b5c49b 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_ThemeColor.fodt
@@ -358,18 +358,18 @@
   </style:style>
   <style:style style:name="gr1" style:family="graphic">
    <style:graphic-properties draw:stroke="none" svg:stroke-width="0.199cm" svg:stroke-color="#b3a2c7" draw:marker-start="" draw:marker-start-width="0.559cm" draw:marker-start-center="false" draw:marker-end="" draw:marker-end-width="0.559cm" draw:marker-end-center="false" svg:stroke-opacity="100%" draw:stroke-linejoin="bevel" draw:fill="solid" draw:fill-color="#558ed5" draw:secondary-fill-color="#d4ea6b" draw:opacity="100%" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" draw:fit-to-size="false" style:shrink-to-fit="false" fo:min-height="2.993cm" fo:min-width="5.004cm" fo:padding-top="0.215cm" fo:padding-bottom="0.215cm" fo:padding-left="0.335cm" fo:padding-right="0.335cm" fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.071cm" draw:shadow-offset-y="0.071cm" draw:shadow-color="#808080" draw:shadow-opacity="100%" style:writing-mode="lr-tb" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph-content" style:horizontal-pos="from-left" style:horizontal-rel="paragraph-content" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false">
-    <loext:fill-color-theme-reference loext:type="dk2">
+    <loext:fill-complex-color loext:theme-type="dk2">
      <loext:transformation loext:type="lummod" loext:value="6000"/>
      <loext:transformation loext:type="lumoff" loext:value="4000"/>
-    </loext:fill-color-theme-reference>
+    </loext:fill-complex-color>
    </style:graphic-properties>
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
   <style:style style:name="gr2" style:family="graphic">
    <style:graphic-properties draw:stroke="none" svg:stroke-width="0.199cm" svg:stroke-color="#b3a2c7" draw:marker-start="" draw:marker-start-width="0.559cm" draw:marker-start-center="false" draw:marker-end="" draw:marker-end-width="0.559cm" draw:marker-end-center="false" svg:stroke-opacity="100%" draw:stroke-linejoin="bevel" draw:fill="solid" draw:fill-color="#948a54" draw:secondary-fill-color="#d4ea6b" draw:opacity="100%" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" draw:fit-to-size="false" style:shrink-to-fit="false" fo:min-height="2.993cm" fo:min-width="5.004cm" fo:padding-top="0.215cm" fo:padding-bottom="0.215cm" fo:padding-left="0.335cm" fo:padding-right="0.335cm" fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.071cm" draw:shadow-offset-y="0.071cm" draw:shadow-color="#808080" draw:shadow-opacity="100%" style:writing-mode="lr-tb" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph-content" style:horizontal-pos="from-left" style:horizontal-rel="paragraph-content" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false">
-    <loext:fill-color-theme-reference loext:type="lt2">
+    <loext:fill-complex-color loext:theme-type="lt2">
      <loext:transformation loext:type="lummod" loext:value="5000"/>
-    </loext:fill-color-theme-reference>
+    </loext:fill-complex-color>
    </style:graphic-properties>
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
@@ -472,4 +472,4 @@
     </draw:custom-shape></text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt
index d946daa8f390..3d8a5ff30ff8 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_axialGradient.fodt
@@ -340,7 +340,7 @@
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-size="12pt" fo:letter-spacing="normal" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="12pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="12pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color" fo:hyphenate="false" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="P3" style:family="paragraph">
@@ -349,19 +349,19 @@
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-size="12pt" fo:letter-spacing="normal" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="12pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="12pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color" fo:hyphenate="false" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Calibri" fo:font-size="12pt" fo:letter-spacing="normal" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="12pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="bold" style:font-name-complex="Arial" style:font-size-complex="12pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="gr1" style:family="graphic">
    <style:graphic-properties draw:stroke="none" svg:stroke-width="0.032cm" draw:stroke-linejoin="round" svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#77933c" loext:fill-use-slide-background="false" draw:opacity-name="Transparency_20_1" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="top" draw:auto-grow-height="false" draw:auto-grow-width="false" fo:min-height="3.034cm" fo:min-width="8.715cm" fo:padding-top="0.127cm" fo:padding-bottom="0.127cm" fo:padding-left="0.254cm" fo:padding-right="0.254cm" fo:wrap-option="wrap" style:writing-mode="lr-tb" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false">
-    <loext:fill-color-theme-reference loext:type="accent3">
+    <loext:fill-complex-color loext:theme-type="accent3">
      <loext:transformation loext:type="lummod" loext:value="7500"/>
-    </loext:fill-color-theme-reference>
+    </loext:fill-complex-color>
    </style:graphic-properties>
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
@@ -459,4 +459,4 @@
     </draw:custom-shape></text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt
index 186a8aaa4cd6..26c32e0cafce 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_rectGradient.fodt
@@ -344,7 +344,7 @@
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Arial Black" fo:font-size="14pt" fo:letter-spacing="normal" fo:language="de" fo:country="DE" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="14pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="14pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="bold" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color" fo:hyphenate="false" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="P3" style:family="paragraph">
@@ -353,20 +353,20 @@
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Arial Black" fo:font-size="14pt" fo:letter-spacing="normal" fo:language="de" fo:country="DE" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="14pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="14pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="bold" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color" fo:hyphenate="false" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Arial Black" fo:font-size="14pt" fo:letter-spacing="normal" fo:language="de" fo:country="DE" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="14pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="14pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="bold" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="gr1" style:family="graphic">
    <style:graphic-properties draw:stroke="none" svg:stroke-width="0.032cm" draw:stroke-linejoin="round" svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#ccc1da" draw:gradient-step-count="0" loext:fill-use-slide-background="false" draw:opacity-name="Transparency_20_3" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="top" draw:auto-grow-height="false" draw:auto-grow-width="false" fo:min-height="3.006cm" fo:min-width="9.04cm" fo:padding-top="0.127cm" fo:padding-bottom="0.127cm" fo:padding-left="0.254cm" fo:padding-right="0.254cm" fo:wrap-option="wrap" style:writing-mode="lr-tb" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0cm" fo:margin-bottom="0.021cm" style:run-through="foreground" style:wrap="run-through" style:number-wrapped-paragraphs="no-limit" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" loext:allow-overlap="true" style:flow-with-text="false">
-    <loext:fill-color-theme-reference loext:type="accent4">
+    <loext:fill-complex-color loext:theme-type="accent4">
      <loext:transformation loext:type="lummod" loext:value="4000"/>
      <loext:transformation loext:type="lumoff" loext:value="6000"/>
-    </loext:fill-color-theme-reference>
+    </loext:fill-complex-color>
    </style:graphic-properties>
    <style:paragraph-properties style:writing-mode="lr-tb"/>
   </style:style>
@@ -490,4 +490,4 @@
     </draw:custom-shape></text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt b/oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt
index 4ef91b628c6d..e1bd186e773d 100644
--- a/oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt
+++ b/oox/qa/unit/data/tdf51195_Fontwork_squareGradient.fodt
@@ -344,7 +344,7 @@
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Arial Black" fo:font-size="14pt" fo:letter-spacing="normal" fo:language="de" fo:country="DE" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="14pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="14pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="bold" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color" fo:hyphenate="false" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="P3" style:family="paragraph">
@@ -353,12 +353,12 @@
     <style:tab-stops/>
    </style:paragraph-properties>
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Arial Black" fo:font-size="14pt" fo:letter-spacing="normal" fo:language="de" fo:country="DE" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="14pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="14pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="bold" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color" fo:hyphenate="false" loext:hyphenation-no-caps="false" loext:hyphenation-no-last-word="false">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="T1" style:family="text">
    <style:text-properties fo:font-variant="normal" fo:text-transform="none" fo:color="#c0504d" loext:opacity="100%" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Arial Black" fo:font-size="14pt" fo:letter-spacing="normal" fo:language="de" fo:country="DE" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:letter-kerning="false" fo:background-color="transparent" style:font-name-asian="ＭＳ 明朝" style:font-size-asian="14pt" style:language-asian="ja" style:country-asian="JP" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Arial" style:font-size-complex="14pt" style:language-complex="ar" style:country-complex="SA" style:font-style-complex="normal" style:font-weight-complex="bold" style:text-emphasize="none" style:text-scale="100%" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color">
-    <loext:char-color-theme-reference loext:type="accent2"/>
+    <loext:char-complex-color loext:theme-type="accent2"/>
    </style:text-properties>
   </style:style>
   <style:style style:name="gr1" style:family="graphic">
@@ -485,4 +485,4 @@
     </draw:custom-shape>dummy</text:p>
   </office:text>
  </office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
index 2466b797933c..3de7acbb8cae 100644
--- a/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
+++ b/schema/libreoffice/OpenDocument-v1.3+libreoffice-schema.rng
@@ -3497,28 +3497,28 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
     </rng:element>
   </rng:define>
 
-  <rng:define name="loext-theme-color-reference-attlist">
+  <rng:define name="loext-complex-color-attlist">
     <rng:interleave>
       <rng:optional>
-        <rng:attribute name="loext:type">
+        <rng:attribute name="loext:theme-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:define name="loext-char-complex-color">
+    <rng:element name="loext:char-complex-color">
+      <rng:ref name="loext-complex-color-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:define name="loext-fill-complex-color">
+    <rng:element name="loext:fill-complex-color">
+      <rng:ref name="loext-complex-color-attlist"/>
       <rng:zeroOrMore>
         <rng:ref name="loext-transformation"/>
       </rng:zeroOrMore>
@@ -3528,14 +3528,14 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
   <!-- TODO no proposal -->
   <rng:define name="style-text-properties-elements" combine="interleave">
     <rng:optional>
-        <rng:ref name="loext-char-color-theme-reference"/>
+        <rng:ref name="loext-char-complex-color"/>
     </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:ref name="loext-fill-complex-color"/>
     </rng:optional>
   </rng:define>
 
diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx
index 716a1ad1cc7c..f3dae4d4c1df 100644
--- a/xmloff/qa/unit/draw.cxx
+++ b/xmloff/qa/unit/draw.cxx
@@ -240,47 +240,47 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testThemeColorExportImport)
 
     // Text color
     OString aStyle1(
-        "//style:style[@style:name='T2']/style:text-properties/loext:char-color-theme-reference");
-    assertXPath(pXmlDoc, aStyle1, "type", "accent3");
+        "//style:style[@style:name='T2']/style:text-properties/loext:char-complex-color");
+    assertXPath(pXmlDoc, aStyle1, "theme-type", "accent3");
     assertXPath(pXmlDoc, aStyle1 + "/loext:transformation[1]", "type", "lummod");
     assertXPath(pXmlDoc, aStyle1 + "/loext:transformation[1]", "value", "2000");
     assertXPath(pXmlDoc, aStyle1 + "/loext:transformation[2]", "type", "lumoff");
     assertXPath(pXmlDoc, aStyle1 + "/loext:transformation[2]", "value", "8000");
 
     OString aStyle2(
-        "//style:style[@style:name='T3']/style:text-properties/loext:char-color-theme-reference");
-    assertXPath(pXmlDoc, aStyle2, "type", "accent3");
+        "//style:style[@style:name='T3']/style:text-properties/loext:char-complex-color");
+    assertXPath(pXmlDoc, aStyle2, "theme-type", "accent3");
     assertXPath(pXmlDoc, aStyle2 + "/loext:transformation[1]", "type", "lummod");
     assertXPath(pXmlDoc, aStyle2 + "/loext:transformation[1]", "value", "6000");
     assertXPath(pXmlDoc, aStyle2 + "/loext:transformation[2]", "type", "lumoff");
     assertXPath(pXmlDoc, aStyle2 + "/loext:transformation[2]", "value", "4000");
 
     OString aStyle3(
-        "//style:style[@style:name='T4']/style:text-properties/loext:char-color-theme-reference");
-    assertXPath(pXmlDoc, aStyle3, "type", "accent3");
+        "//style:style[@style:name='T4']/style:text-properties/loext:char-complex-color");
+    assertXPath(pXmlDoc, aStyle3, "theme-type", "accent3");
     assertXPath(pXmlDoc, aStyle3 + "/loext:transformation[1]", "type", "lummod");
     assertXPath(pXmlDoc, aStyle3 + "/loext:transformation[1]", "value", "5000");
 
     // Shapes fill color
     OString aShape1("//style:style[@style:name='gr1']/style:graphic-properties/"
-                    "loext:fill-color-theme-reference");
-    assertXPath(pXmlDoc, aShape1, "type", "accent2");
+                    "loext:fill-complex-color");
+    assertXPath(pXmlDoc, aShape1, "theme-type", "accent2");
     assertXPath(pXmlDoc, aShape1 + "/loext:transformation[1]", "type", "lummod");
     assertXPath(pXmlDoc, aShape1 + "/loext:transformation[1]", "value", "2000");
     assertXPath(pXmlDoc, aShape1 + "/loext:transformation[2]", "type", "lumoff");
     assertXPath(pXmlDoc, aShape1 + "/loext:transformation[2]", "value", "8000");
 
     OString aShape2("//style:style[@style:name='gr2']/style:graphic-properties/"
-                    "loext:fill-color-theme-reference");
-    assertXPath(pXmlDoc, aShape2, "type", "accent2");
+                    "loext:fill-complex-color");
+    assertXPath(pXmlDoc, aShape2, "theme-type", "accent2");
     assertXPath(pXmlDoc, aShape2 + "/loext:transformation[1]", "type", "lummod");
     assertXPath(pXmlDoc, aShape2 + "/loext:transformation[1]", "value", "6000");
     assertXPath(pXmlDoc, aShape2 + "/loext:transformation[2]", "type", "lumoff");
     assertXPath(pXmlDoc, aShape2 + "/loext:transformation[2]", "value", "4000");
 
     OString aShape3("//style:style[@style:name='gr3']/style:graphic-properties/"
-                    "loext:fill-color-theme-reference");
-    assertXPath(pXmlDoc, aShape3, "type", "accent2");
+                    "loext:fill-complex-color");
+    assertXPath(pXmlDoc, aShape3, "theme-type", "accent2");
     assertXPath(pXmlDoc, aShape3 + "/loext:transformation[1]", "type", "lummod");
     assertXPath(pXmlDoc, aShape3 + "/loext:transformation[1]", "value", "5000");
 
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index bca1d6eccc0f..56a1eaaef601 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3492,8 +3492,9 @@ namespace xmloff::token {
         TOKEN("linked-style-name",   XML_LINKED_STYLE_NAME ),
 
         TOKEN("theme",               XML_THEME ),
-        TOKEN("char-color-theme-reference", XML_CHAR_COMPLEX_COLOR),
-        TOKEN("fill-color-theme-reference", XML_FILL_COMPLEX_COLOR),
+        TOKEN("theme-type",          XML_THEME_TYPE ),
+        TOKEN("char-complex-color", XML_CHAR_COMPLEX_COLOR),
+        TOKEN("fill-complex-color", XML_FILL_COMPLEX_COLOR),
         TOKEN("dk1",                 XML_DK1 ),
         TOKEN("lt1",                 XML_LT1 ),
         TOKEN("dk2",                 XML_DK2 ),
diff --git a/xmloff/source/text/XMLComplexColorContext.cxx b/xmloff/source/text/XMLComplexColorContext.cxx
index f506a71941d9..88d1eca12bfa 100644
--- a/xmloff/source/text/XMLComplexColorContext.cxx
+++ b/xmloff/source/text/XMLComplexColorContext.cxx
@@ -40,7 +40,7 @@ XMLComplexColorContext::XMLComplexColorContext(
     {
         switch (aIter.getToken())
         {
-            case XML_ELEMENT(LO_EXT, XML_TYPE):
+            case XML_ELEMENT(LO_EXT, XML_THEME_TYPE):
             {
                 sal_Int16 nValue = -1;
                 if (SvXMLUnitConverter::convertEnum(nValue, aIter.toView(), pXML_ThemeColor_Enum))
diff --git a/xmloff/source/text/XMLComplexColorExport.cxx b/xmloff/source/text/XMLComplexColorExport.cxx
index a118d12ba689..ba2ead3a958d 100644
--- a/xmloff/source/text/XMLComplexColorExport.cxx
+++ b/xmloff/source/text/XMLComplexColorExport.cxx
@@ -47,7 +47,7 @@ void XMLComplexColorExport::exportXML(const uno::Any& rAny, sal_uInt16 nPrefix,
         return;
 
     XMLTokenEnum nToken = constThemeColorTypeToToken[sal_Int16(aComplexColor.getSchemeType())];
-    mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_TYPE, nToken);
+    mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_THEME_TYPE, nToken);
     SvXMLElementExport aComplexColorElement(mrExport, nPrefix, rLocalName, true, true);
 
     for (auto const& rTransform : aComplexColor.getTransformations())
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index 2fe53258a2f6..98487c15a103 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -3236,8 +3236,9 @@ rtl
 symmetric
 linked-style-name
 theme
-char-color-theme-reference
-fill-color-theme-reference
+theme-type
+char-complex-color
+fill-complex-color
 dk1
 lt1
 dk2