diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2019-10-15 11:17:24 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2019-10-15 14:32:35 +0200 |
| commit | 9270f74466d0eb841babaa24997f608631c70341 (patch) | |
| tree | e9e1ffa2e95642b67b4bb545103fc40288b3e2c7 | |
| parent | 3bb3e19ba79e40c3c3b2504213f5179f3ba5354f (diff) | |
tdf#79007: Do not overwrite if only one of nBrightness...
...or nContrast is != 0
Thanks to M. Stahl
Change-Id: I28a08f31ca1e93d7b06f56700baea0d8ab6c7de4
Reviewed-on: https://gerrit.libreoffice.org/80818
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 2a2deccf544d..c64b0862d225 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -761,6 +761,8 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe { // map MSO 'washout' to our Watermark colormode eColorMode = ColorMode_WATERMARK; + nBrightness = 0; + nContrast = 0; } else if( nBrightness != 0 && nContrast != 0 ) { @@ -769,11 +771,10 @@ void GraphicProperties::pushToPropMap( PropertyMap& rPropMap, const GraphicHelpe // contrast or brightness need to be altered, the result is the same, but if both are involved, // there's no way to map that, so just force a conversion of the image. xGraphic = applyBrightnessContrast( xGraphic, nBrightness, nContrast ); + nBrightness = 0; + nContrast = 0; } - nBrightness = 0; - nContrast = 0; - if(mbIsCustomShape) { // it is a cropped graphic. |