summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2018-06-19 11:35:21 +0300
committerSzymon Kłos <szymon.klos@collabora.com>2018-06-29 10:29:33 +0200
commit4087130d0531a31456310bfe5c41a028dacd5a4d (patch)
tree2df8dd4185d6cf2c589ff4d71e6e56c3ef07b0c0 /oox
parent054a3586bb4808728a5cd58ea8a867539c08e55c (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. Change-Id: If6cb513ca6e4336e49bc56a9509aede2e1937063 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>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/shapes.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 7b51e62b0059..410ef022fb28 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1756,7 +1756,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( ::Color(rBorderLine.Color) );
+ if ( rBorderLine.Color == sal_Int32( COL_AUTO ) )
+ mpFS->singleElementNS( XML_a, XML_noFill, FSEND );
+ else
+ DrawingML::WriteSolidFill( ::Color(rBorderLine.Color) );
mpFS->endElementNS( XML_a, XML_line );
}
}