diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-11-23 08:11:22 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-11-23 09:07:42 +0100 |
| commit | ed662bcc20804e8b8d5946904f1b577a825f09de (patch) | |
| tree | d6726268de898b476ba2345819d83b37085a9800 /include | |
| parent | cea0b1f894bfd29af5a4f9392d4fb45db9a1a938 (diff) | |
PPTX import: implement native handling of a color's luminance modulation
This was already handled in oox/ at import-time: this adds it to the doc
model, including UNO API and PPTX import.
This is a dependency PPTX export and UI.
Change-Id: I5d875b53d715beb10c13ef616d06cf958d43f70f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125684
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/colritem.hxx | 2 | ||||
| -rw-r--r-- | include/editeng/memberids.h | 1 | ||||
| -rw-r--r-- | include/editeng/unoprnms.hxx | 1 | ||||
| -rw-r--r-- | include/editeng/unotext.hxx | 1 | ||||
| -rw-r--r-- | include/oox/drawingml/color.hxx | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx index ce51be7f3e30..103c887fbdb6 100644 --- a/include/editeng/colritem.hxx +++ b/include/editeng/colritem.hxx @@ -33,6 +33,8 @@ private: Color mColor; sal_Int16 maThemeIndex; sal_Int16 maTintShade; + /// Luminance Modulation: 100th percentage, defaults to 10000. + sal_Int16 mnLumMod; public: static SfxPoolItem* CreateDefault(); diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h index c6d781da568a..117c9e2873e1 100644 --- a/include/editeng/memberids.h +++ b/include/editeng/memberids.h @@ -183,6 +183,7 @@ //#define MID_GRAPHIC_TRANSPARENT 3 // used, but already defined above #define MID_COLOR_THEME_INDEX 4 #define MID_COLOR_TINT_OR_SHADE 5 +#define MID_COLOR_LUM_MOD 6 #endif diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx index 91273845fbd2..e980acb9c8ec 100644 --- a/include/editeng/unoprnms.hxx +++ b/include/editeng/unoprnms.hxx @@ -329,6 +329,7 @@ #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_COLOR_LUM_MOD "CharColorLumMod" #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 c9c4b9580f72..0b38565f179f 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -89,6 +89,7 @@ struct SfxItemPropertyMapEntry; { 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"" UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD, EE_CHAR_COLOR, ::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_LUM_MOD }, \ { 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/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index bd67982c6e92..3a8f494ca089 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -100,6 +100,7 @@ public: const OUString& getSchemeColorName() const { return msSchemeName; } sal_Int16 getSchemeColorIndex() const; sal_Int16 getTintOrShade(); + sal_Int16 getLumMod(); /** Returns the unaltered list of transformations for interoperability purposes */ const css::uno::Sequence< css::beans::PropertyValue >& getTransformations() const { return maInteropTransformations;} |