diff options
author | Tünde Tóth <toth.tunde@nisz.hu> | 2023-04-19 14:48:33 +0200 |
---|---|---|
committer | László Németh <nemeth@numbertext.org> | 2023-04-25 15:04:09 +0200 |
commit | 2ef83c8782ed947b47f9292a12355fc3bb078078 (patch) | |
tree | dfe58eb982045d78b07abbe50ffe5938649361bf /oox | |
parent | 5ee52d401e2086f79f794a4ec1a1d7beec8aa582 (diff) |
tdf#91332 XLSX export: fix missing solidFill
Background color of shape inherited from theme
lost after export.
Regression from commit bc0a9076aa43a0782bcf81e55d3f84f6af0f68e8
"ooxml: Preserve shape theme attribute for solid fill".
Change-Id: I2d8298ac17332ba3ad6a627ce8b07c23087ac7b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150674
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/export/drawingml.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 60a5cdd62d7e..77c4c1b02186 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -530,7 +530,8 @@ void DrawingML::WriteSolidFill( const Reference< XPropertySet >& rXPropSet ) WriteSolidFill(::Color(ColorTransparency, nFillColor & 0xffffff), nAlpha); } } - else if ( !sColorFillScheme.isEmpty() ) + // tdf#91332 LO doesn't export the actual theme.xml in XLSX. + else if ( !sColorFillScheme.isEmpty() && GetDocumentType() != DOCUMENT_XLSX ) { // the shape had a scheme color and the user didn't change it WriteSolidFill( sColorFillScheme, aTransformations, nAlpha ); |