diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-06-02 22:22:43 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-07-03 21:46:41 +0200 |
| commit | d070003bc43e19ef22a737202d018d8c9712b80e (patch) | |
| tree | 878b7fa479abb113cc1b590ace70b4ddb3872f3b /xmloff/source/chart/SchXMLExport.cxx | |
| parent | f65a9efc9abadaa804d1c4e2a26a5c95bd3cd555 (diff) | |
Refactor regression curve handling in xmloff import to use chart2.
Additionally support more regression curves per one series and
add polynomial an moving average tokens.
Conflicts:
xmloff/source/chart/SchXMLPlotAreaContext.cxx
Change-Id: I9dfebb1f47942c88ab0ccff48ec7632136fb1bc9
Diffstat (limited to 'xmloff/source/chart/SchXMLExport.cxx')
| -rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index cc45d6a4300e..0995189c99e4 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2668,7 +2668,6 @@ void SchXMLExportHelper_Impl::exportSeries( sal_Int32 nSeriesLength = 0; sal_Int32 nAttachedAxis = chart::ChartAxisAssign::PRIMARY_Y; sal_Bool bHasMeanValueLine = false; - chart::ChartRegressionCurveType eRegressionType( chart::ChartRegressionCurveType_NONE ); Reference< beans::XPropertySet > xPropSet; tLabelValuesDataPair aSeriesLabelValuesPair; @@ -2725,10 +2724,6 @@ void SchXMLExportHelper_Impl::exportSeries( aAny = xPropSet->getPropertyValue( OUString( "MeanValue" )); aAny >>= bHasMeanValueLine; - - aAny = xPropSet->getPropertyValue( - OUString( "RegressionCurves" )); - aAny >>= eRegressionType; } catch( const beans::UnknownPropertyException & rEx ) { @@ -2889,8 +2884,7 @@ void SchXMLExportHelper_Impl::exportSeries( } } - if( eRegressionType != chart::ChartRegressionCurveType_NONE && - xPropSet.is() && + if( xPropSet.is() && mxExpPropMapper.is() ) { exportRegressionCurve( aSeriesSeq[nSeriesIdx], xPropSet, rPageSize, bExportContent ); @@ -2914,9 +2908,9 @@ void SchXMLExportHelper_Impl::exportSeries( } void SchXMLExportHelper_Impl::exportRegressionCurve( - const Reference< chart2::XDataSeries > & xSeries, - const Reference< beans::XPropertySet > & xSeriesProp, - const awt::Size & rPageSize, + const Reference< chart2::XDataSeries >& xSeries, + const Reference< beans::XPropertySet >& xSeriesProp, + const awt::Size& rPageSize, sal_Bool bExportContent ) { OSL_ASSERT( mxExpPropMapper.is()); |