diff options
| author | Sarper Akdemir <sarper.akdemir@collabora.com> | 2021-08-18 16:04:37 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-11-17 15:40:25 +0100 |
| commit | 013ec5ef7ac038b6b1b8b937e81880f30434098a (patch) | |
| tree | f73f03b094af4cba0f27da7856b2fddd4b733675 /svx/source | |
| parent | 192a16d6b0bad2d312b244a5576dfce3f4b05c36 (diff) | |
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 <vmiklos@collabora.com>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/unodraw/unoprov.cxx | 4 | ||||
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 2 |
2 files changed, 5 insertions, 1 deletions
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 } }; |