include/editeng/unoprnms.hxx | 2 ++
include/editeng/unotext.hxx | 4 +++-
svx/source/unodraw/unoprov.cxx | 4 +++-
svx/source/unodraw/unoshap2.cxx | 2 ++
4 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 013ec5ef7ac038b6b1b8b937e81880f30434098a
Author: Sarper Akdemir <sarper.akde...@collabora.com>
AuthorDate: Wed Aug 18 16:04:37 2021 +0300
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Nov 17 15:40:25 2021 +0100
expose the SvxColorItem theme related uno for draw/impress
[ Miklos: added the missing SvxShapeControlPropertyMapping entries,
breaking tests. ]
(cherry picked from commit 88b6801ff2aa61ed2f0d64cef94fe6a9c09f3a35,
from the feature/themesupport2 branch)
Change-Id: Ifdcde6c4643eb9ac1c36040f5ccb490b9d900efd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125394
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 97aaa77dd86a..91273845fbd2 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -327,6 +327,8 @@
#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_TINT_OR_SHADE "CharColorTintOrShade"
#define UNO_NAME_EDIT_CHAR_TRANSPARENCE "CharTransparence"
#define UNO_NAME_EDIT_CHAR_CROSSEDOUT "CharCrossedOut"
#define UNO_NAME_EDIT_CHAR_STRIKEOUT "CharStrikeout"
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 5b92daf4d8aa..c9c4b9580f72 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -85,8 +85,10 @@ struct SfxItemPropertyMapEntry;
{ u"" UNO_NAME_EDIT_CHAR_POSTURE, EE_CHAR_ITALIC,
::cppu::UnoType<css::awt::FontSlant>::get(),0, MID_POSTURE }, \
{ u"" UNO_NAME_EDIT_CHAR_WEIGHT, EE_CHAR_WEIGHT,
cppu::UnoType<float>::get(), 0, MID_WEIGHT }, \
{ 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, 0 }, \
+ { 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_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 }, \
{ u"" UNO_NAME_EDIT_CHAR_ESCAPEMENT, EE_CHAR_ESCAPEMENT,
::cppu::UnoType<sal_Int16>::get(), 0, MID_ESC }, \
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 39369d880448..b459280c8b01 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -582,7 +582,9 @@ static SfxItemPropertyMapEntry const *
ImplGetSvxControlShapePropertyMap()
{ u"" UNO_NAME_EDIT_CHAR_UNDERLINE, 0,
cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ 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, 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_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 },
{ u"CharRelief", 0,
cppu::UnoType<sal_Int16>::get(), 0, 0 },
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 710f2e38099d..415ddf95eeb9 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -595,6 +595,8 @@ const SvxShapeControlPropertyMapping[] =
{ RTL_CONSTASCII_STRINGPARAM("ControlTypeinMSO"),
RTL_CONSTASCII_STRINGPARAM("ControlTypeinMSO") },
{ RTL_CONSTASCII_STRINGPARAM("ObjIDinMSO"),
RTL_CONSTASCII_STRINGPARAM("ObjIDinMSO") },
{ RTL_CONSTASCII_STRINGPARAM("CharCaseMap"),
RTL_CONSTASCII_STRINGPARAM("CharCaseMap") },
+ { RTL_CONSTASCII_STRINGPARAM("CharColorTheme"),
RTL_CONSTASCII_STRINGPARAM("CharColorTheme") },
+ { RTL_CONSTASCII_STRINGPARAM("CharColorTintOrShade"),
RTL_CONSTASCII_STRINGPARAM("CharColorTintOrShade") },
{ nullptr,0, nullptr, 0 }
};
