diff options
| author | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-01-30 12:23:46 +0100 |
|---|---|---|
| committer | Jacobo Aragunde Pérez <jaragunde@igalia.com> | 2014-01-30 12:29:06 +0100 |
| commit | 28db7d7919524989aff96c33051cceeac4adb2a1 (patch) | |
| tree | 77bff77cfb3430ea1792c9414ebc1068504c84b0 /oox | |
| parent | 4e8736ed562e4e54775042f082082d52e5b203f0 (diff) | |
drawingML: fix transparency of shape solid fill
The empty value for transparency in drawingML is 100% and not 0.
Change-Id: I5f34f03b9b72cc20e92e32f9c9bc1bdfae73ff55
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index c9eefec9825c..5363df24ecf4 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -166,7 +166,7 @@ void DrawingML::WriteColor( sal_uInt32 nColor, sal_Int32 nAlpha ) sColor = sBuf.getStr(); } - if( nAlpha ) + if( nAlpha < MAX_PERCENT ) { mpFS->startElementNS( XML_a, XML_srgbClr, XML_val, sColor.getStr(), FSEND ); mpFS->singleElementNS( XML_a, XML_alpha, XML_val, OString::number(nAlpha), FSEND ); @@ -231,11 +231,11 @@ void DrawingML::WriteSolidFill( Reference< XPropertySet > rXPropSet ) aGrabBag[i].Value >>= aStyleProperties; } - sal_Int32 nAlpha = 0; + sal_Int32 nAlpha = MAX_PERCENT; if( GetProperty( rXPropSet, "FillTransparence" ) ) { - sal_Int32 nTransparency; - rXPropSet->getPropertyValue( "FillTransparence" ) >>= nTransparency; + sal_Int32 nTransparency = 0; + mAny >>= nTransparency; // Calculate alpha value (see oox/source/drawingml/color.cxx : getTransparency()) nAlpha = (MAX_PERCENT - ( PER_PERCENT * nTransparency ) ); } |