diff options
| author | Regényi Balázs <regenyi.balazs@nisz.hu> | 2020-09-07 19:54:19 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-09-11 15:36:15 +0200 |
| commit | 83c30743eaf44d8eded4a73e3ac2585b5bdbaffc (patch) | |
| tree | ec0a21411b481c56cfc7bb2dbc8120a89c95ad0b /oox | |
| parent | 099bd18dea7efadbe25a8519d98d24cb69c35b95 (diff) | |
tdf#77236 DOCX shape export: fix missing solidFill
(resulting for example, invisible shapes).
Co-authored-by: Szabolcs Tóth
Change-Id: I328514022f4a594c374d5a97db39d1cf3a954e02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102195
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 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 06bbfea85d61..605e85ffa087 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -926,14 +926,17 @@ void DrawingML::WriteOutline( const Reference<XPropertySet>& rXPropSet, Referenc // the line had a scheme color and the user didn't change it WriteSolidFill( sColorFillScheme, aTransformations ); } - else if( aStyleProperties.hasElements() ) - { - if( nColor != nStyleColor ) - // the line style defines some color but it wasn't being used - WriteSolidFill( nColor ); - // in case the shape used the style color and the user didn't change it, - // we must not write a <a: solidFill> tag. - } + // tdf#77236: I do not understand why this condition is required. + // The original docx document of bug tdf#77236 includes the native colors in both places, + // so, I think, we can export this color too (not only schema ones). + //else if( aStyleProperties.hasElements() ) + //{ + // if( nColor != nStyleColor ) + // // the line style defines some color but it wasn't being used + // WriteSolidFill( nColor ); + // // in case the shape used the style color and the user didn't change it, + // // we must not write a <a: solidFill> tag. + //} else { WriteSolidFill( nColor, nColorAlpha ); |