summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorTünde Tóth <toth.tunde@nisz.hu>2023-04-19 14:48:33 +0200
committerAndras Timar <andras.timar@collabora.com>2023-05-13 20:05:26 +0200
commit7193ef35a8352efa6b208c1bebcfecc0ffe13a62 (patch)
tree2f432a48aa57c0f7da1713a66427e1f5a594be4a /oox
parenta2d87b5de38a90e3d398ecfe59c886f0c0c5cef5 (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> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151038
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/drawingml.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 44877b10eaa2..1eebf6ca3211 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -513,7 +513,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 );