summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-04-04 02:41:49 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2015-04-04 04:15:22 +0200
commit6f37dc503c8ade591a2550439e11d2c2981c074a (patch)
treee983a39cd085f57fc91f1f85979af4839a6670e7 /oox
parent547c58a6173535c679027c83fb3ed77f6060fd09 (diff)
don't import data labels border properties for noFill borders
They are not shown anyway and just confuse us internally as they contain a width but no color and produce invalid documents during export. Change-Id: Ibe20a27b0172ece86dbb1f734df567b903465ebf
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/chart/seriesconverter.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 19253149be8a..747092948964 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -168,6 +168,10 @@ void lclConvertLabelFormatting( PropertySet& rPropSet, ObjectFormatter& rFormatt
void importBorderProperties( PropertySet& rPropSet, Shape& rShape, const GraphicHelper& rGraphicHelper )
{
LineProperties& rLP = rShape.getLineProperties();
+ // no fill has the same effect as no border so skip it
+ if (rLP.maLineFill.moFillType.get() == XML_noFill)
+ return;
+
if (rLP.moLineWidth.has())
{
sal_Int32 nWidth = convertEmuToHmm(rLP.moLineWidth.get());