From 4ca0ca862fcfb81a500b52f4ae6454d949d8681c Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 4 Apr 2015 02:45:33 +0200 Subject: make that code a bit more robust against strange internal states Change-Id: I1fd67449b9182db8eb9fb0e58b092cef00283c2a --- oox/source/export/chartexport.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'oox') diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 6187f678d475..c12bf02025fe 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -2598,12 +2598,15 @@ void writeLabelProperties( { pFS->startElement(FSNS(XML_c, XML_spPr), FSEND); pFS->startElement(FSNS(XML_a, XML_ln), XML_w, IS(convertHmmToEmu(nLabelBorderWidth)), FSEND); - pFS->startElement(FSNS(XML_a, XML_solidFill), FSEND); + if (nLabelBorderColor != -1) + { + pFS->startElement(FSNS(XML_a, XML_solidFill), FSEND); - OString aStr = OString::number(nLabelBorderColor, 16).toAsciiUpperCase(); - pFS->singleElement(FSNS(XML_a, XML_srgbClr), XML_val, aStr.getStr(), FSEND); + OString aStr = OString::number(nLabelBorderColor, 16).toAsciiUpperCase(); + pFS->singleElement(FSNS(XML_a, XML_srgbClr), XML_val, aStr.getStr(), FSEND); - pFS->endElement(FSNS(XML_a, XML_solidFill)); + pFS->endElement(FSNS(XML_a, XML_solidFill)); + } pFS->endElement(FSNS(XML_a, XML_ln)); pFS->endElement(FSNS(XML_c, XML_spPr)); } -- cgit