diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-05-25 13:55:21 +0900 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2023-06-04 15:37:30 +0200 |
commit | 433a2ced036b8522a60559d9ca6387e5b478e3a9 (patch) | |
tree | 9ff5584bad5f3fda231c5c0f05ff636f18d28c01 /oox | |
parent | 7925c5d445870a5021761ef55c0c1c5314ecfae9 (diff) |
xmloff: add color-type attribute to complex color
We need to identify what the color type of the complex color is.
For now we mostly use "theme", but in the future we can also have
other types like "rgb",... when the infrastructure for that is
built.
Change-Id: I38c91d294a191ca3124be4e99050977c9815d23e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152253
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 38e0e78998153463caf9c3c72ef7f4549ddff0e8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152516
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/qa/unit/data/ReferenceShapeFill.fodp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/oox/qa/unit/data/ReferenceShapeFill.fodp b/oox/qa/unit/data/ReferenceShapeFill.fodp index d3db08712ac9..432891b0d849 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="'Noto Sans CJK SC'" 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="'Droid Sans Devanagari'" 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-complex-color loext:theme-type="dark1"/> + <loext:char-complex-color loext:color-type="theme" loext:theme-type="dark1"/> </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-complex-color loext:theme-type="dark1"/> + <loext:char-complex-color loext:color-type="theme" loext:theme-type="dark1"/> </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-complex-color loext:theme-type="dark1"/> + <loext:char-complex-color loext:color-type="theme" loext:theme-type="dark1"/> </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-complex-color loext:theme-type="dark1"/> + <loext:char-complex-color loext:color-type="theme" loext:theme-type="dark1"/> </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="'Noto Sans CJK SC'" 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="'Droid Sans Devanagari'" 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-complex-color loext:theme-type="dark1"/> + <loext:char-complex-color loext:color-type="theme" loext:theme-type="dark1"/> </style:text-properties> </style:style> <style:presentation-page-layout style:name="AL0T26"> @@ -531,7 +531,7 @@ </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-complex-color loext:theme-type="accent6"> + <loext:fill-complex-color loext:color-type="theme" loext:theme-type="accent6"> <loext:transformation loext:type="lummod" loext:value="7500"/> </loext:fill-complex-color> </style:graphic-properties> @@ -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-complex-color loext:theme-type="light1"/> + <loext:char-complex-color loext:color-type="theme" loext:theme-type="light1"/> </style:text-properties> </style:style> <text:list-style style:name="L1"> |