summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-11-24 08:22:47 +0100
committerMiklos Vajna <vmiklos@collabora.com>2021-11-24 09:33:30 +0100
commita557a1c4ac0b73668452f80169870bdfb204aeb6 (patch)
tree5e7b2b4aa3a9d531b6bbbdff17643878f37f6707 /include
parentecfce0ff23d9f1ed5a51b29b14a7043dce87b300 (diff)
PPTX import: implement native handling of a color's luminance offset
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, and also the last transform which is easy to generate from the PowerPoint UI and we didn't import to the doc model. Change-Id: Ica4e738d8dc8e0409160ceab941a82f2475ddc68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125749 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'include')
-rw-r--r--include/editeng/colritem.hxx4
-rw-r--r--include/editeng/memberids.h1
-rw-r--r--include/editeng/unoprnms.hxx1
-rw-r--r--include/editeng/unotext.hxx1
-rw-r--r--include/oox/drawingml/color.hxx1
5 files changed, 7 insertions, 1 deletions
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 103c887fbdb6..cd223d2777bc 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -33,8 +33,10 @@ private:
Color mColor;
sal_Int16 maThemeIndex;
sal_Int16 maTintShade;
- /// Luminance Modulation: 100th percentage, defaults to 10000.
+ /// Luminance Modulation: 100th percentage, defaults to 100%.
sal_Int16 mnLumMod;
+ /// Luminance Offset: 100th percentage, defaults to 0%.
+ sal_Int16 mnLumOff;
public:
static SfxPoolItem* CreateDefault();
diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h
index 117c9e2873e1..1b50ab467229 100644
--- a/include/editeng/memberids.h
+++ b/include/editeng/memberids.h
@@ -184,6 +184,7 @@
#define MID_COLOR_THEME_INDEX 4
#define MID_COLOR_TINT_OR_SHADE 5
#define MID_COLOR_LUM_MOD 6
+#define MID_COLOR_LUM_OFF 7
#endif
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index e980acb9c8ec..f09afa09d487 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -330,6 +330,7 @@
#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_COLOR_LUM_OFF "CharColorLumOff"
#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 0b38565f179f..a2b4ae7e7181 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -90,6 +90,7 @@ struct SfxItemPropertyMapEntry;
{ 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"" UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF, EE_CHAR_COLOR, ::cppu::UnoType<sal_Int16>::get(), 0, MID_COLOR_LUM_OFF }, \
{ 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 3a8f494ca089..c0dd8d67a31c 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -101,6 +101,7 @@ public:
sal_Int16 getSchemeColorIndex() const;
sal_Int16 getTintOrShade();
sal_Int16 getLumMod();
+ sal_Int16 getLumOff();
/** Returns the unaltered list of transformations for interoperability purposes */
const css::uno::Sequence< css::beans::PropertyValue >& getTransformations() const { return maInteropTransformations;}