summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-02-12 00:32:34 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2014-02-12 01:01:36 +0100
commita67f56f78c52161b3934d61848ab9388f75a57a1 (patch)
treeaf838ccb9f7e62f4734a803537be3a2176b7ac5d /oox
parent171bde3d1e3fb5c7d3cd1fd25e6135e2f7272cb6 (diff)
until we support custUnit make sure that all files are valid
Change-Id: I759a4cc97e2a2adf71322d2aa18fdb11873a538e
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/chartexport.cxx15
1 files changed, 8 insertions, 7 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index dbbeb07bcb7c..72afb089c404 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2396,22 +2396,23 @@ void ChartExport::_exportAxis(
if(bDisplayUnits)
{
OUString aVal;
- pFS->startElement( FSNS( XML_c, XML_dispUnits ),
- FSEND );
if(GetProperty( xAxisProp, "BuiltInUnit" ))
{
mAny >>= aVal;
if(!aVal.isEmpty())
{
+ pFS->startElement( FSNS( XML_c, XML_dispUnits ),
+ FSEND );
+
OString aBuiltInUnit = OUStringToOString(aVal, RTL_TEXTENCODING_UTF8);
pFS->singleElement( FSNS( XML_c, XML_builtInUnit ),
- XML_val, aBuiltInUnit.getStr(),
- FSEND );
+ XML_val, aBuiltInUnit.getStr(),
+ FSEND );
+
+ pFS->singleElement(FSNS( XML_c, XML_dispUnitsLbl ),FSEND);
+ pFS->endElement( FSNS( XML_c, XML_dispUnits ) );
}
}
- pFS->singleElement(FSNS( XML_c, XML_dispUnitsLbl ),FSEND);
- pFS->endElement( FSNS( XML_c, XML_dispUnits ) );
-
}
}
// TODO: text properties