Little cleanup in ODT regression lines import/export

Change-Id: Ie6cdfec1295e08cd5141056eeac39f248ee97766

2 files changed, 14 insertions, 24 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;
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 3930b4f70b7c..9ea3ae77ab58 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -241,7 +241,7 @@ Reference< chart2::data::XLabeledDataSequence2 > lcl_createAndAddSequenceToSerie
     return xLabeledSeq;
 }
 
-XMLPropStyleContext* lcl_GetStyleContext(
+XMLPropStyleContext* lcl_GetStylePropContext(
                         const SvXMLStylesContext* pStylesCtxt,
                         const SvXMLStyleContext*& rpStyle,
                         OUString& rStyleName )
@@ -875,7 +875,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
 
             if (!rCurrentStyleName.isEmpty())
             {
-                XMLPropStyleContext* pCurrent = lcl_GetStyleContext(pStylesCtxt, rpStyle, rCurrentStyleName);
+                XMLPropStyleContext* pCurrent = lcl_GetStylePropContext(pStylesCtxt, rpStyle, rCurrentStyleName);
                 if( pCurrent )
                 {
                     pPropStyleContext = pCurrent;
@@ -889,7 +889,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
 
             if (!iStyle->msStyleName.isEmpty())
             {
-                XMLPropStyleContext* pCurrent = lcl_GetStyleContext(pStylesCtxt, rpStyle, iStyle->msStyleName);
+                XMLPropStyleContext* pCurrent = lcl_GetStylePropContext(pStylesCtxt, rpStyle, iStyle->msStyleName);
                 if( pCurrent )
                 {
                     pPropStyleContext = pCurrent;