diff options
author | Regényi Balázs <regenyi.balazs@nisz.hu> | 2020-09-16 14:48:33 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-09-29 16:36:16 +0200 |
commit | d67809efc6b372f5c8ddfa88551fcc89efe48cdc (patch) | |
tree | 1e8dea606e88784238d5ba31d14c8ab8cd73b817 /oox | |
parent | ecb06c0c5af4563d2feae5a927ab23542f63001b (diff) |
tdf#124013 XLSX shape export: fix missing solidFill
of the inside of the shape (resulting for example,
invisible shapes).
See also commit 83c30743eaf44d8eded4a73e3ac2585b5bdbaffc
(tdf#77236 DOCX shape export: fix missing solidFill).
Co-authored-by: Szabolcs Toth
Change-Id: I4efde86f82e22e1aa49b89dc13557ef5f238ba83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102871
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103616
Tested-by: Jenkins
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/export/drawingml.cxx | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 8a45e22d3fc3..9e803aa6f38c 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -438,36 +438,10 @@ void DrawingML::WriteSolidFill( const Reference< XPropertySet >& rXPropSet ) // the shape had a scheme color and the user didn't change it WriteSolidFill( sColorFillScheme, aTransformations, nAlpha ); } - else if ( aStyleProperties.hasElements() ) - { - sal_uInt32 nThemeColor = 0; - sal_Int32 nThemeAlpha = MAX_PERCENT; - for( const auto& rStyleProp : std::as_const(aStyleProperties) ) - { - if( rStyleProp.Name == "Color" ) - { - rStyleProp.Value >>= nThemeColor; - } - else if(rStyleProp.Name == "Transformations" ) - { - Sequence< PropertyValue > aStyleTransformations; - rStyleProp.Value >>= aStyleTransformations; - auto pProp = std::find_if(std::cbegin(aStyleTransformations), std::cend(aStyleTransformations), - [](const PropertyValue& rProp) { return rProp.Name == "alpha"; }); - if (pProp != std::cend(aStyleTransformations)) - pProp->Value >>= nThemeAlpha; - } - } - if ( nFillColor != nThemeColor || nAlpha != nThemeAlpha ) - // the shape contains a theme but it wasn't being used - WriteSolidFill( ::Color(nFillColor & 0xffffff), nAlpha ); - - // in case the shape used the style color and the user didn't change it, - // we must not write a <a: solidFill> tag. - } else { // the shape had a custom color and the user didn't change it + // tdf#124013 WriteSolidFill( ::Color(nFillColor & 0xffffff), nAlpha ); } } |