From f932b00f3a72dd802a6e50af84c3dc55072a22a0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 5 May 2022 20:18:06 +0200 Subject: tdf#148929 sd theme: limit PPTX import for shape fill effects to lum mod/off Regression from 30735bdb5a0a81619000fdd24b2d0fbf45687f01 (sd theme: add PPTX import for shape fill color effects, 2022-04-27), the bugdoc's A2 cell lost its tinting (its background color is no longer lighter than A1) after saving back to PPTX + import again. The code assumed that in case a fill color has effects, it can only be luminance offset or modulation, since that's what the PowerPoint UI generates when setting a fill color explicitly. This did not take the table style case into account, which uses tinting to make a color lighter. Fix the problem by not importing the theme index / effects if tinting is used -- the current doc model is limited to theme index + lum mod/off with effects. This limitation can be removed while text color / fill color effects are not limited to lum mod/off, but also support tinting/shading. Change-Id: I382cc0067518cc262e261a462999170cb7db261b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133908 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- include/oox/drawingml/color.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/oox/drawingml') diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx index cc65c1346720..b28c926986ca 100644 --- a/include/oox/drawingml/color.hxx +++ b/include/oox/drawingml/color.hxx @@ -99,7 +99,7 @@ public: /** Returns the scheme name from the a:schemeClr element for interoperability purposes */ const OUString& getSchemeColorName() const { return msSchemeName; } sal_Int16 getSchemeColorIndex() const; - sal_Int16 getTintOrShade(); + sal_Int16 getTintOrShade() const; sal_Int16 getLumMod() const; sal_Int16 getLumOff() const; -- cgit