diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2022-04-27 20:12:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-04-28 08:15:54 +0200 |
| commit | 30735bdb5a0a81619000fdd24b2d0fbf45687f01 (patch) | |
| tree | 43a99bea091701eee066d9f1410777671d3b3b9f /oox | |
| parent | bd568b360450b348ff0e6813862a49892df81140 (diff) | |
sd theme: add PPTX import for shape fill color effects
This is always direct formatting, so FillProperties::pushToPropMap()
always has the needed info at hand.
Change-Id: I3317b618e0e8bb7688d0f0fbfe4546e2e8b4e947
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133525
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/color.cxx | 4 | ||||
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 6 | ||||
| -rw-r--r-- | oox/source/token/properties.txt | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx index ee854a761fa2..982b77ff4831 100644 --- a/oox/source/drawingml/color.cxx +++ b/oox/source/drawingml/color.cxx @@ -496,7 +496,7 @@ sal_Int16 Color::getTintOrShade() return 0; } -sal_Int16 Color::getLumMod() +sal_Int16 Color::getLumMod() const { for (const auto& rTransform : maTransforms) { @@ -512,7 +512,7 @@ sal_Int16 Color::getLumMod() return 10000; } -sal_Int16 Color::getLumOff() +sal_Int16 Color::getLumOff() const { for (const auto& rTransform : maTransforms) { diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 5555a6d5250f..2d85bf807e1a 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -397,6 +397,12 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, { rPropMap.setProperty(PROP_FillColorTheme, nPhClrTheme); } + else + { + rPropMap.setProperty(PROP_FillColorTheme, maFillColor.getSchemeColorIndex()); + rPropMap.setProperty(PROP_FillColorLumMod, maFillColor.getLumMod()); + rPropMap.setProperty(PROP_FillColorLumOff, maFillColor.getLumOff()); + } eFillStyle = FillStyle_SOLID; } diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt index e318e0038ecb..8467d3683875 100644 --- a/oox/source/token/properties.txt +++ b/oox/source/token/properties.txt @@ -177,6 +177,8 @@ FillBitmapSizeY FillBitmap FillColor FillColorTheme +FillColorLumMod +FillColorLumOff FillGradient FillGradientName FillHatch |