diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-23 06:08:32 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-02-23 06:42:01 +0100 |
| commit | 783a0757dad17b5594927fe6c66834406984868c (patch) | |
| tree | f8c2048331995f66359fa471345121df51a46980 /oox | |
| parent | c68ea7ef4a75decae6c157bc49205bedb08192ee (diff) | |
prevent invalid OOXML chart files, related #i75121#
Change-Id: I8e34fd2941ce98a30d27861db2c6a625ff873aa6
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 9d4c045c111c..fdc0c2b776a0 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1758,16 +1758,20 @@ void ChartExport::exportSeries( Reference< chart2::XChartType > xChartType, sal_ exportTrendlines( aSeriesSeq[nSeriesIdx] ); - //export error bars here - Reference< XPropertySet > xSeriesPropSet( xSource, uno::UNO_QUERY ); - Reference< XPropertySet > xErrorBarYProps; - xSeriesPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps; - if(xErrorBarYProps.is()) - exportErrorBar(xErrorBarYProps, true); - Reference< XPropertySet > xErrorBarXProps; - xSeriesPropSet->getPropertyValue("ErrorBarX") >>= xErrorBarXProps; - if(xErrorBarXProps.is()) - exportErrorBar(xErrorBarXProps, false); + if( eChartType != chart::TYPEID_PIE && + eChartType != chart::TYPEID_RADARLINE ) + { + //export error bars here + Reference< XPropertySet > xSeriesPropSet( xSource, uno::UNO_QUERY ); + Reference< XPropertySet > xErrorBarYProps; + xSeriesPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarYProps; + if(xErrorBarYProps.is()) + exportErrorBar(xErrorBarYProps, true); + Reference< XPropertySet > xErrorBarXProps; + xSeriesPropSet->getPropertyValue("ErrorBarX") >>= xErrorBarXProps; + if(xErrorBarXProps.is()) + exportErrorBar(xErrorBarXProps, false); + } // export categories if( eChartType != chart::TYPEID_SCATTER && mxCategoriesValues.is() ) |