summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTünde Tóth <toth.tunde@nisz.hu>2022-01-19 14:53:50 +0100
committerLászló Németh <nemeth@numbertext.org>2022-02-02 17:27:00 +0100
commit1bce0e3004e3ec9d62a3c43801f8f2e8ef5f7fdb (patch)
treefc16f38f3dc356717a9b7df8c7adda306c8aafb7 /oox
parent6c4bc632180c25b3ceb30e32383b3f5db8eaf0e2 (diff)
tdf#112209 PPTX import: fix grayscale effect on image filled shape
Some image filled shapes with grayscale effect in PPTX documents created with PowerPoint were not grayscale in Impress. Change-Id: I0a89f283f525eb47c21c5d5fa788484d8074a7e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128616 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/fillproperties.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 480bbe641737..5d17c321d0f8 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -722,6 +722,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap,
if (xGraphic.is())
{
+ if (maBlipProps.moColorEffect.get(XML_TOKEN_INVALID) == XML_grayscl)
+ xGraphic = lclGreysScaleGraphic(xGraphic);
+
if (rPropMap.supportsProperty(ShapeProperty::FillBitmapName) &&
rPropMap.setProperty(ShapeProperty::FillBitmapName, xGraphic))
{