diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-06-08 16:38:22 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-07-03 21:46:42 +0200 |
| commit | 2ca5e7b46f965faa0408128cd5881703fbb6cd94 (patch) | |
| tree | 249907dc3fb0b250aec55809344f69ee09bc0d80 /xmloff/source/chart/SchXMLExport.cxx | |
| parent | 4b50558feca6dc3035cba6fff6dd9fa4b3a85779 (diff) | |
Little cleanup in ODT regression lines import/export
Change-Id: Ie6cdfec1295e08cd5141056eeac39f248ee97766
Diffstat (limited to 'xmloff/source/chart/SchXMLExport.cxx')
| -rw-r--r-- | xmloff/source/chart/SchXMLExport.cxx | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index f22ea208cd47..a58524d42100 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -2933,17 +2933,19 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( if (!xRegCurve.is()) continue; - bool bShowEquation = false; - bool bShowRSquared = false; - bool bExportEquation = false; - Reference< beans::XPropertySet > xProperties( xRegCurve , uno::UNO_QUERY ); - - OUString aService; + if( !xProperties.is() ) + continue; Reference< lang::XServiceName > xServiceName( xProperties, uno::UNO_QUERY ); if( !xServiceName.is() ) continue; + + bool bShowEquation = false; + bool bShowRSquared = false; + bool bExportEquation = false; + + OUString aService; aService = xServiceName->getServiceName(); aPropertyStates = mxExpPropMapper->Filter( xProperties ); @@ -2954,11 +2956,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( aPropertyStates.push_back(property); Reference< beans::XPropertySet > xEquationProperties; - if( xRegCurve.is()) - { - xEquationProperties.set( xRegCurve->getEquationProperties() ); - } - + xEquationProperties.set( xRegCurve->getEquationProperties() ); if( xEquationProperties.is()) { xEquationProperties->getPropertyValue( OUString("ShowEquation")) >>= bShowEquation; @@ -2997,16 +2995,8 @@ void SchXMLExportHelper_Impl::exportRegressionCurve( SvXMLElementExport aRegressionExport( mrExport, XML_NAMESPACE_CHART, XML_REGRESSION_CURVE, sal_True, sal_True ); if( bExportEquation ) { - // default is true - if( !bShowEquation ) - { - mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, XML_FALSE ); - } - // default is false - if( bShowRSquared ) - { - mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_R_SQUARE, XML_TRUE ); - } + mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_EQUATION, (bShowEquation ? XML_TRUE : XML_FALSE) ); + mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_DISPLAY_R_SQUARE, (bShowRSquared ? XML_TRUE : XML_FALSE) ); // export position chart2::RelativePosition aRelativePosition; |