diff options
| author | Tünde Tóth <toth.tunde@nisz.hu> | 2021-12-08 11:13:24 +0100 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-12-21 21:23:24 +0100 |
| commit | 642f85b234d61ed87ee74f94b713321572e6774e (patch) | |
| tree | c0d7a2d2fef9a9ee4d5e625a704634f5da131bc5 /oox | |
| parent | b644b8c3b63cca1ae63bfae9ad7608924ead9ca5 (diff) | |
tdf#127989 OOXML: fix import of transparent hatching
Set FillBackground property of hatching fill to false,
if the alpha value is 0 in the <a:bgClr> element, i.e.
if it's a transparent hatching. This way the previous
non-transparent hatching is transparent now.
Change-Id: I483d5c654be55e74c9073769b06f185526429635
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126550
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 001afbed910b7e565f602c1b11b1b4538cd59442)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127247
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 12d2cd9ad2fd..6a60a685c84f 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -816,8 +816,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, // Set background color for hatch if(maPatternProps.maPattBgColor.isUsed()) { - rPropMap.setProperty( ShapeProperty::FillBackground, true ); - rPropMap.setProperty( ShapeProperty::FillColor, maPatternProps.maPattBgColor.getColor( rGraphicHelper, nPhClr ) ); + aColor = maPatternProps.maPattBgColor; + rPropMap.setProperty( ShapeProperty::FillBackground, aColor.getTransparency() != 100 ); + rPropMap.setProperty( ShapeProperty::FillColor, aColor.getColor( rGraphicHelper, nPhClr ) ); } } else if ( maPatternProps.maPattBgColor.isUsed() ) |