diff options
| author | geri1245 <g.tarsoly@yahoo.com> | 2017-12-06 19:40:59 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-25 17:38:22 +0200 |
| commit | f6612a34ef8d3b7af6f3196ad5af2db06b0a4dd4 (patch) | |
| tree | 61554c1bfe22b72013511cace3e66e4dda40c886 /oox/source | |
| parent | 21b9867d78b30c8334be6d38dad48efb744a733f (diff) | |
tdf#111785 Save hatch background color in pptx format.
When exporting to pptx from LO, the background color of
the hatching is preserved. The default background, when no
hatch background is set is transparent.
Change-Id: Ie44c89a9ce54eef49100b3e7b376c27c1a952fcf
Reviewed-on: https://gerrit.libreoffice.org/46098
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
(cherry picked from commit 54dfb9ff07a41d9249302ac2ed0a005d0a8114d4)
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index d243a4f99d13..046d128957c8 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1189,9 +1189,26 @@ void DrawingML::WritePattFill( const Reference< XPropertySet >& rXPropSet ) WriteColor(aHatch.Color); mpFS->endElementNS( XML_a , XML_fgClr ); - // In Writer hatching has no background so use white as a default value. + sal_uInt32 nColor = COL_WHITE; + sal_Int32 nAlpha = 0; + bool isBackgroundFilled = false; + + if ( GetProperty( rXPropSet, "FillBackground" ) ) + { + mAny >>= isBackgroundFilled; + if( isBackgroundFilled ) + { + nAlpha = MAX_PERCENT; + + if( GetProperty( rXPropSet, "FillColor" ) ) + { + mAny >>= nColor; + } + } + } + mpFS->startElementNS( XML_a , XML_bgClr, FSEND ); - WriteColor(COL_WHITE); + WriteColor(nColor, nAlpha); mpFS->endElementNS( XML_a , XML_bgClr ); mpFS->endElementNS( XML_a , XML_pattFill ); |