diff options
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svxids.hrc | 2 | ||||
| -rw-r--r-- | include/svx/unoshprp.hxx | 4 | ||||
| -rw-r--r-- | include/svx/xcolit.hxx | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index d3da901a09ce..90aae09d2c69 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -449,7 +449,7 @@ class XFillGradientItem; #define SID_ATTR_TEXTCOLUMNS_NUMBER ( SID_SVX_START + 340 ) #define SID_ATTR_TEXTCOLUMNS_SPACING ( SID_SVX_START + 341 ) -#define SID_ATTR_COLOR_THEME_REFERENCE TypedWhichId<SvxColorItem>( SID_SVX_START + 342 ) +// FREE ( SID_SVX_START + 342 ) #define SID_ATTR_COLOR_THEME_INDEX TypedWhichId<SfxInt16Item>( SID_SVX_START + 343 ) #define SID_ATTR_COLOR_LUM_MOD TypedWhichId<SfxInt16Item>( SID_SVX_START + 344 ) #define SID_ATTR_COLOR_LUM_OFF TypedWhichId<SfxInt16Item>( SID_SVX_START + 345 ) 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<css::drawing::LineCap>::get(), 0, 0}, \ { UNO_NAME_LINECOLOR, XATTR_LINECOLOR, ::cppu::UnoType<sal_Int32>::get() , 0, 0}, \ - { UNO_NAME_LINECOLOR_THEME_REFERENCE, XATTR_LINECOLOR, ::cppu::UnoType<css::util::XThemeColor>::get() , 0, MID_COLOR_THEME_REFERENCE}, \ + { UNO_NAME_LINE_COMPLEX_COLOR, XATTR_LINECOLOR, ::cppu::UnoType<css::util::XComplexColor>::get() , 0, MID_COMPLEX_COLOR}, \ { UNO_NAME_LINEENDCENTER, XATTR_LINEENDCENTER, cppu::UnoType<bool>::get() , 0, 0}, \ { UNO_NAME_LINEENDWIDTH, XATTR_LINEENDWIDTH, ::cppu::UnoType<sal_Int32>::get() , 0, 0, PropertyMoreFlags::METRIC_ITEM}, \ { UNO_NAME_LINEJOINT, XATTR_LINEJOINT, ::cppu::UnoType<css::drawing::LineJoint>::get(), 0, 0}, \ @@ -294,7 +294,7 @@ { UNO_NAME_FILLCOLOR_THEME, XATTR_FILLCOLOR, ::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_THEME_INDEX}, \ { UNO_NAME_FILLCOLOR_LUM_MOD, XATTR_FILLCOLOR, ::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_LUM_MOD}, \ { UNO_NAME_FILLCOLOR_LUM_OFF, XATTR_FILLCOLOR, ::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_LUM_OFF}, \ - { UNO_NAME_FILLCOLOR_THEME_REFERENCE, XATTR_FILLCOLOR, ::cppu::UnoType<css::util::XThemeColor>::get(), 0, MID_COLOR_THEME_REFERENCE}, \ + { UNO_NAME_FILL_COMPLEX_COLOR, XATTR_FILLCOLOR, ::cppu::UnoType<css::util::XComplexColor>::get(), 0, MID_COMPLEX_COLOR}, \ { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP , ::cppu::UnoType<css::text::GraphicCrop>::get(), 0, 0 }, \ { UNO_NAME_FILLUSESLIDEBACKGROUND, XATTR_FILLUSESLIDEBACKGROUND, cppu::UnoType<bool>::get(), 0, 0}, diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 3ece0ef3b52b..965d10195146 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -22,7 +22,7 @@ #include <tools/color.hxx> #include <editeng/colritem.hxx> -#include <docmodel/theme/ThemeColor.hxx> +#include <docmodel/color/ComplexColor.hxx> #include <svx/svxdllapi.h> #include <svx/xit.hxx> @@ -32,7 +32,7 @@ class XColorList; class SVXCORE_DLLPUBLIC XColorItem : public NameOrIndex { Color aColor; - model::ThemeColor maThemeColor; + model::ComplexColor maComplexColor; public: static SfxPoolItem* CreateDefault(); @@ -50,8 +50,9 @@ public: const Color& GetColorValue() const; void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); } - model::ThemeColor& GetThemeColor() { return maThemeColor; } - const model::ThemeColor& GetThemeColor() const { return maThemeColor; } + void setComplexColor(model::ComplexColor const& rComplexColor) { maComplexColor = rComplexColor; } + const model::ComplexColor& getComplexColor() const { return maComplexColor; } + model::ComplexColor& getComplexColor() { return maComplexColor; } virtual void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; |