include/editeng/unoprnms.hxx | 4 ++--
include/editeng/unotext.hxx | 2 +-
oox/source/drawingml/textcharacterproperties.cxx | 2 +-
oox/source/token/properties.txt | 2 +-
svx/source/unodraw/unoprov.cxx | 2 +-
sw/source/core/unocore/unomapproperties.hxx | 6 +++---
writerfilter/source/dmapper/DomainMapper.cxx | 2 +-
writerfilter/source/dmapper/PropertyIds.cxx | 2 +-
writerfilter/source/dmapper/PropertyIds.hxx | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit f53fc19ee0e2f67712d34cdf1925e15bb89b244a
Author: Sarper Akdemir <sarper.akde...@collabora.com>
AuthorDate: Wed Sep 1 09:34:36 2021 +0300
Commit: Sarper Akdemir <sarper.akde...@collabora.com>
CommitDate: Wed Sep 1 17:44:14 2021 +0300
rename CharColorTheme to CharColorThemeColorIndex
Changed CharColorTheme to remove ambiguity.
Helps to differantiate whether this references the whole
theme color set or just a color in the theme color set.
(in this case it is a color in the theme color set.)
Change-Id: I197c5283c5331af6387b6ffc80761476e9fa8bed
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 3c5011210d51..8418dbf2e91c 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -22,7 +22,7 @@
#define UNO_NAME_CHAR_COLOR "CharColor"
-#define UNO_NAME_CHAR_COLOR_THEME "CharColorTheme"
+#define UNO_NAME_CHAR_COLOR_THEME_COLOR_INDEX "CharColorThemeColorIndex"
#define UNO_NAME_CHAR_COLOR_TINT_OR_SHADE "CharColorTintOrShade"
#define UNO_NAME_CHAR_HEIGHT "CharHeight"
#define UNO_NAME_CHAR_POSTURE "CharPosture"
@@ -325,7 +325,7 @@
#define UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX "CharLocaleComplex"
#define UNO_NAME_EDIT_CHAR_COLOR "CharColor"
-#define UNO_NAME_EDIT_CHAR_COLOR_THEME "CharColorTheme"
+#define UNO_NAME_EDIT_CHAR_COLOR_THEME_COLOR_INDEX "CharColorThemeColorIndex"
#define UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE "CharColorTintOrShade"
#define UNO_NAME_EDIT_CHAR_TRANSPARENCE "CharTransparence"
#define UNO_NAME_EDIT_CHAR_CROSSEDOUT "CharCrossedOut"
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 896130f6d257..59c7fd32b12a 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -87,7 +87,7 @@ struct SfxItemPropertyMapEntry;
{ u"" UNO_NAME_EDIT_CHAR_LOCALE, EE_CHAR_LANGUAGE,
::cppu::UnoType<css::lang::Locale>::get(),0, MID_LANG_LOCALE }, \
{ u"" UNO_NAME_EDIT_CHAR_COLOR, EE_CHAR_COLOR,
::cppu::UnoType<sal_Int32>::get(), 0, MID_COLOR_RGB }, \
{ u"" UNO_NAME_EDIT_CHAR_TRANSPARENCE,EE_CHAR_COLOR,
::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_ALPHA }, \
- { u"" UNO_NAME_EDIT_CHAR_COLOR_THEME, EE_CHAR_COLOR,
::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_THEME_INDEX }, \
+ { u"" UNO_NAME_EDIT_CHAR_COLOR_THEME_COLOR_INDEX, EE_CHAR_COLOR,
::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_THEME_INDEX }, \
{ u"" UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, EE_CHAR_COLOR,
::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_TINT_OR_SHADE }, \
{ 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 }, \
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index bd4d051a490b..e6faa9cd64bb 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -112,7 +112,7 @@ void TextCharacterProperties::pushToPropMap( PropertyMap&
rPropMap, const XmlFil
Color aColor = maFillProperties.getBestSolidColor();
rPropMap.setProperty(PROP_CharColor,
aColor.getColor(rFilter.getGraphicHelper()));
// set color theme index
- rPropMap.setProperty(PROP_CharColorTheme,
aColor.getSchemeColorIndex());
+ rPropMap.setProperty(PROP_CharColorThemeColorIndex,
aColor.getSchemeColorIndex());
rPropMap.setProperty(PROP_CharColorTintOrShade,
aColor.getTintOrShade());
if (aColor.hasTransparency())
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 1b20bfe61828..cc9068c23a07 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -54,7 +54,7 @@ CharBackColor
CharCaseMap
CharColor
CharContoured
-CharColorTheme
+CharColorThemeColorIndex
CharColorTintOrShade
CharEscapement
CharEscapementHeight
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index f5564ef236d0..8c4787a19c14 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -579,7 +579,7 @@ static SfxItemPropertyMapEntry const *
ImplGetSvxControlShapePropertyMap()
{ u"" UNO_NAME_EDIT_CHAR_STRIKEOUT, 0,
cppu::UnoType<sal_Int16>::get(), 0, 0},
{ u"" UNO_NAME_EDIT_CHAR_CASEMAP, 0,
cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ u"" UNO_NAME_EDIT_CHAR_COLOR, 0,
cppu::UnoType<sal_Int32>::get(), 0, MID_COLOR_RGB },
- { u"" UNO_NAME_EDIT_CHAR_COLOR_THEME, 0,
cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_THEME_INDEX },
+ { u"" UNO_NAME_EDIT_CHAR_COLOR_THEME_COLOR_INDEX, 0,
cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_THEME_INDEX },
{ u"" UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, 0,
cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_TINT_OR_SHADE },
{ u"CharBackColor", 0,
cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ u"CharBackTransparent", 0, cppu::UnoType<bool>::get(),
0, 0 },
diff --git a/sw/source/core/unocore/unomapproperties.hxx
b/sw/source/core/unocore/unomapproperties.hxx
index f873500432e7..70dfc7e3855f 100644
--- a/sw/source/core/unocore/unomapproperties.hxx
+++ b/sw/source/core/unocore/unomapproperties.hxx
@@ -123,7 +123,7 @@
{ u"" UNO_NAME_CHAR_CASE_MAP,
RES_CHRATR_CASEMAP, cppu::UnoType<sal_Int16>::get(),
PropertyAttribute::MAYBEVOID, 0 }, \
{ u"" UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int32>::get(),
PropertyAttribute::MAYBEVOID, MID_COLOR_RGB }, \
{ u"" UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(),
PropertyAttribute::MAYBEVOID, MID_COLOR_ALPHA }, \
- { u"" UNO_NAME_CHAR_COLOR_THEME, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(),
PropertyAttribute::MAYBEVOID, MID_COLOR_THEME_INDEX }, \
+ { u"" UNO_NAME_CHAR_COLOR_THEME_COLOR_INDEX, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(),
PropertyAttribute::MAYBEVOID, MID_COLOR_THEME_INDEX }, \
{ u"" UNO_NAME_CHAR_COLOR_TINT_OR_SHADE, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(),
PropertyAttribute::MAYBEVOID, MID_COLOR_TINT_OR_SHADE }, \
{ u"" UNO_NAME_CHAR_STRIKEOUT,
RES_CHRATR_CROSSEDOUT, cppu::UnoType<sal_Int16>::get(),
PropertyAttribute::MAYBEVOID, MID_CROSS_OUT }, \
{ u"" UNO_NAME_CHAR_CROSSED_OUT,
RES_CHRATR_CROSSEDOUT, cppu::UnoType<bool>::get(),
PropertyAttribute::MAYBEVOID, MID_CROSSED_OUT }, \
@@ -367,7 +367,7 @@
{ u"" UNO_NAME_CHAR_CASE_MAP, RES_CHRATR_CASEMAP,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, 0},\
{ u"" UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_COLOR_RGB }, \
{ u"" UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_ALPHA},\
- { u"" UNO_NAME_CHAR_COLOR_THEME, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_THEME_INDEX
}, \
+ { u"" UNO_NAME_CHAR_COLOR_THEME_COLOR_INDEX,
RES_CHRATR_COLOR, cppu::UnoType<sal_Int16>::get(),
PROPERTY_NONE, MID_COLOR_THEME_INDEX }, \
{ u"" UNO_NAME_CHAR_COLOR_TINT_OR_SHADE, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_TINT_OR_SHADE
}, \
{ u"" UNO_NAME_CHAR_STRIKEOUT, RES_CHRATR_CROSSEDOUT,
cppu::UnoType<sal_Int16>::get(), PropertyAttribute::MAYBEVOID,
MID_CROSS_OUT},\
{ u"" UNO_NAME_CHAR_CROSSED_OUT, RES_CHRATR_CROSSEDOUT,
cppu::UnoType<bool>::get() , PROPERTY_NONE, 0},\
@@ -474,7 +474,7 @@
{ u"" UNO_NAME_CHAR_BACK_COLOR, RES_CHRATR_BACKGROUND,
cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE ,MID_BACK_COLOR
}, \
{ u"" UNO_NAME_CHAR_COLOR, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int32>::get(), PROPERTY_NONE, MID_COLOR_RGB }, \
{ u"" UNO_NAME_CHAR_TRANSPARENCE, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_ALPHA }, \
- { u"" UNO_NAME_CHAR_COLOR_THEME, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_THEME_INDEX
}, \
+ { u"" UNO_NAME_CHAR_COLOR_THEME_COLOR_INDEX,
RES_CHRATR_COLOR, cppu::UnoType<sal_Int16>::get(),
PROPERTY_NONE, MID_COLOR_THEME_INDEX }, \
{ u"" UNO_NAME_CHAR_COLOR_TINT_OR_SHADE, RES_CHRATR_COLOR,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_COLOR_TINT_OR_SHADE
}, \
{ u"" UNO_NAME_CHAR_CONTOURED, RES_CHRATR_CONTOUR,
cppu::UnoType<bool>::get() , PROPERTY_NONE, 0}, \
{ u"" UNO_NAME_CHAR_EMPHASIS, RES_CHRATR_EMPHASIS_MARK,
cppu::UnoType<sal_Int16>::get(), PROPERTY_NONE, MID_EMPHASIS}, \
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 8ba4881c4e13..a03dd96ce6d8 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -992,7 +992,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
if (m_pImpl->GetTopContext())
{
sal_Int16 nIndex =
TDefTableHandler::getThemeColorTypeIndex(nIntValue);
- m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR_THEME_INDEX,
uno::makeAny(nIndex));
+
m_pImpl->GetTopContext()->Insert(PROP_CHAR_COLOR_THEME_COLOR_INDEX,
uno::makeAny(nIndex));
}
m_pImpl->appendGrabBag(m_pImpl->m_aSubInteropGrabBag,
"themeColor", TDefTableHandler::getThemeColorTypeString(nIntValue));
break;
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 08b695a6007d..b72b97cc975f 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -32,7 +32,7 @@ OUString getPropertyName( PropertyIds eId )
case PROP_CHAR_SHADOWED: sName = "CharShadowed"; break;
case PROP_CHAR_CASE_MAP: sName = "CharCaseMap"; break;
case PROP_CHAR_COLOR: sName = "CharColor"; break;
- case PROP_CHAR_COLOR_THEME_INDEX: sName = "CharColorTheme"; break;
+ case PROP_CHAR_COLOR_THEME_COLOR_INDEX: sName =
"CharColorThemeColorIndex"; break;
case PROP_CHAR_COLOR_TINT_OR_SHADE: sName = "CharColorTintOrShade";
break;
case PROP_CHAR_RELIEF: sName = "CharRelief"; break;
case PROP_CHAR_UNDERLINE: sName = "CharUnderline"; break;
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx
b/writerfilter/source/dmapper/PropertyIds.hxx
index 09ec7954c8df..f0802f99d037 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -54,7 +54,7 @@ enum PropertyIds
,PROP_CHAR_CASE_MAP
,PROP_CHAR_CHAR_KERNING
,PROP_CHAR_COLOR
- ,PROP_CHAR_COLOR_THEME_INDEX
+ ,PROP_CHAR_COLOR_THEME_COLOR_INDEX
,PROP_CHAR_COLOR_TINT_OR_SHADE
,PROP_CHAR_COMBINE_IS_ON
,PROP_CHAR_COMBINE_PREFIX
