From 1df0565fb92972bd410e7db85eef1e4bec3fcc31 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Mon, 8 May 2023 14:09:00 +0900 Subject: use ComplexColor instead of ThemeColor for better OOXML compat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In OOXML a color definition includes more represenations, one of which is scheme color (which is what is implemented in ThemeColor currently), but it supports other representations too (RGB, HSL, System,..). ComplexColor includes all the representations, so to have a better compatibility with OOXML, this changes all uses of ThemeColor to ComplexColor. In many cases the usage of ComplexColor isn't the same as the usage of ThemeColors, but this cases will need to be changed in a later commit. Change-Id: I9cc8acee2ac0a1998fe9b98247bcf4a96273149a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151492 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- include/svx/unoshprp.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/svx/unoshprp.hxx') diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx index 828e02771e4b..6c60eac60933 100644 --- a/include/svx/unoshprp.hxx +++ b/include/svx/unoshprp.hxx @@ -237,7 +237,7 @@ #define LINE_PROPERTIES_DEFAULTS\ { UNO_NAME_LINECAP, XATTR_LINECAP, ::cppu::UnoType::get(), 0, 0}, \ { UNO_NAME_LINECOLOR, XATTR_LINECOLOR, ::cppu::UnoType::get() , 0, 0}, \ - { UNO_NAME_LINECOLOR_THEME_REFERENCE, XATTR_LINECOLOR, ::cppu::UnoType::get() , 0, MID_COLOR_THEME_REFERENCE}, \ + { UNO_NAME_LINE_COMPLEX_COLOR, XATTR_LINECOLOR, ::cppu::UnoType::get() , 0, MID_COMPLEX_COLOR}, \ { UNO_NAME_LINEENDCENTER, XATTR_LINEENDCENTER, cppu::UnoType::get() , 0, 0}, \ { UNO_NAME_LINEENDWIDTH, XATTR_LINEENDWIDTH, ::cppu::UnoType::get() , 0, 0, PropertyMoreFlags::METRIC_ITEM}, \ { UNO_NAME_LINEJOINT, XATTR_LINEJOINT, ::cppu::UnoType::get(), 0, 0}, \ @@ -294,7 +294,7 @@ { UNO_NAME_FILLCOLOR_THEME, XATTR_FILLCOLOR, ::cppu::UnoType::get(), 0, MID_COLOR_THEME_INDEX}, \ { UNO_NAME_FILLCOLOR_LUM_MOD, XATTR_FILLCOLOR, ::cppu::UnoType::get(), 0, MID_COLOR_LUM_MOD}, \ { UNO_NAME_FILLCOLOR_LUM_OFF, XATTR_FILLCOLOR, ::cppu::UnoType::get(), 0, MID_COLOR_LUM_OFF}, \ - { UNO_NAME_FILLCOLOR_THEME_REFERENCE, XATTR_FILLCOLOR, ::cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE}, \ + { UNO_NAME_FILL_COMPLEX_COLOR, XATTR_FILLCOLOR, ::cppu::UnoType::get(), 0, MID_COMPLEX_COLOR}, \ { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP , ::cppu::UnoType::get(), 0, 0 }, \ { UNO_NAME_FILLUSESLIDEBACKGROUND, XATTR_FILLUSESLIDEBACKGROUND, cppu::UnoType::get(), 0, 0}, -- cgit