diff options
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/memberids.h | 4 | ||||
| -rw-r--r-- | include/editeng/unoprnms.hxx | 8 | ||||
| -rw-r--r-- | include/editeng/unotext.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h index 0db3c27d0128..e5f1f075290a 100644 --- a/include/editeng/memberids.h +++ b/include/editeng/memberids.h @@ -189,8 +189,8 @@ #define MID_COLOR_TINT_OR_SHADE 5 #define MID_COLOR_LUM_MOD 6 #define MID_COLOR_LUM_OFF 7 -#define MID_COLOR_THEME_REFERENCE 8 -#define MID_COLOR_THEME_REFERENCE_JSON 9 +#define MID_COMPLEX_COLOR_JSON 8 +#define MID_COMPLEX_COLOR 9 #endif diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index 9c96b29e8681..8859dfe5a4a5 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -23,7 +23,7 @@ inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR = u"CharColor"; inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_THEME = u"CharColorTheme"; inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_TINT_OR_SHADE = u"CharColorTintOrShade"; -inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_THEME_REFERENCE = u"CharColorThemeReference"; +inline constexpr OUStringLiteral UNO_NAME_CHAR_COMPLEX_COLOR = u"CharComplexColor"; inline constexpr OUStringLiteral UNO_NAME_CHAR_HEIGHT = u"CharHeight"; inline constexpr OUStringLiteral UNO_NAME_CHAR_POSTURE = u"CharPosture"; inline constexpr OUStringLiteral UNO_NAME_CHAR_SHADOWED = u"CharShadowed"; @@ -35,7 +35,7 @@ inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR = u"FillColor"; inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_THEME = u"FillColorTheme"; inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_LUM_MOD = u"FillColorLumMod"; inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_LUM_OFF = u"FillColorLumOff"; -inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_THEME_REFERENCE = u"FillColorThemeReference"; +inline constexpr OUStringLiteral UNO_NAME_FILL_COMPLEX_COLOR = u"FillComplexColor"; inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENT = u"FillGradient"; inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENTNAME = u"FillGradientName"; inline constexpr OUStringLiteral UNO_NAME_FILLHATCH = u"FillHatch"; @@ -77,7 +77,7 @@ inline constexpr OUStringLiteral UNO_NAME_LINESTYLE = u"LineStyle"; inline constexpr OUStringLiteral UNO_NAME_LINEDASH = u"LineDash"; inline constexpr OUStringLiteral UNO_NAME_LINEWIDTH = u"LineWidth"; inline constexpr OUStringLiteral UNO_NAME_LINECOLOR = u"LineColor"; -inline constexpr OUStringLiteral UNO_NAME_LINECOLOR_THEME_REFERENCE = u"LineColorThemeReference"; +inline constexpr OUStringLiteral UNO_NAME_LINE_COMPLEX_COLOR = u"LineComplexColor"; inline constexpr OUStringLiteral UNO_NAME_LINEJOINT = u"LineJoint"; inline constexpr OUStringLiteral UNO_NAME_LINESTART = u"LineStart"; inline constexpr OUStringLiteral UNO_NAME_LINEEND = u"LineEnd"; @@ -340,7 +340,7 @@ inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_THEME = u"CharColorThe inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE = u"CharColorTintOrShade"; inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD = u"CharColorLumMod"; inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF = u"CharColorLumOff"; -inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE = u"CharColorThemeReference"; +inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_COMPLEX_COLOR = u"CharComplexColor"; inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_TRANSPARENCE = u"CharTransparence"; inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_CROSSEDOUT = u"CharCrossedOut"; inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_STRIKEOUT = u"CharStrikeout"; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 935f6ce1b66b..84dc7d9fdb6f 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/util/XThemeColor.hpp> +#include <com/sun/star/util/XComplexColor.hpp> #include <comphelper/interfacecontainer4.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakagg.hxx> @@ -92,7 +92,7 @@ struct SfxItemPropertyMapEntry; { UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, EE_CHAR_COLOR, ::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_TINT_OR_SHADE }, \ { UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD, EE_CHAR_COLOR, ::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_LUM_MOD }, \ { UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF, EE_CHAR_COLOR, ::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_LUM_OFF }, \ - { UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, EE_CHAR_COLOR, ::cppu::UnoType<css::util::XThemeColor>::get(), 0, MID_COLOR_THEME_REFERENCE }, \ + { UNO_NAME_EDIT_CHAR_COMPLEX_COLOR, EE_CHAR_COLOR, ::cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_COMPLEX_COLOR }, \ { u"CharBackColor", EE_CHAR_BKGCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0 }, \ { u"CharBackTransparent", EE_CHAR_BKGCOLOR, ::cppu::UnoType<bool>::get(), 0, MID_GRAPHIC_TRANSPARENT }, \ { UNO_NAME_EDIT_CHAR_ESCAPEMENT, EE_CHAR_ESCAPEMENT, ::cppu::UnoType<sal_Int16>::get(), 0, MID_ESC }, \ |