diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-06-19 11:35:21 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-07-06 10:43:05 +0200 |
| commit | 19c922c86eac577513c1da9ece891adfddb3f502 (patch) | |
| tree | b959d690135dc11a467649eacdc7c6d44a21b934 /oox | |
| parent | 1e1b6fab2cde6dce8a398621bf7a40c143516ef6 (diff) | |
tdf#104199 sd: export non-borders as noFill
...followup to commit 76505bbd862b17b9b02a2d6e68bac308890dec70
which made the border invisible by setting the color to COL_AUTO.
But being invisible isn't good enough because on a round-trip
we are now losing the "noFill" attribute and saving a defined
border. However, COL_AUTO is turned into white during import,
in both LO and in MSO, so round-tripping displayed a
white border instead of an invisible one.
Reviewed-on: https://gerrit.libreoffice.org/55658
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 4087130d0531a31456310bfe5c41a028dacd5a4d)
Change-Id: If6cb513ca6e4336e49bc56a9509aede2e1937063
Reviewed-on: https://gerrit.libreoffice.org/56751
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit fb043986ca8d2d1b7b6179ef7e2412aa677d5c7d)
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 63705ff0cc9f..4989f86e6fad 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1737,7 +1737,10 @@ void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& r if ( nBorderWidth > 0 ) { mpFS->startElementNS( XML_a, XML_line, XML_w, I32S(nBorderWidth), FSEND ); - DrawingML::WriteSolidFill( util::Color(rBorderLine.Color) ); + if ( rBorderLine.Color == sal_Int32( COL_AUTO ) ) + mpFS->singleElementNS( XML_a, XML_noFill, FSEND ); + else + DrawingML::WriteSolidFill( util::Color(rBorderLine.Color) ); mpFS->endElementNS( XML_a, XML_line ); } } |