Change series and trendline pop-up to support more trendlines.

Conflicts:
	chart2/source/controller/main/ChartController_Window.cxx

Change-Id: I70eb06d74670f54fa3792723711e9f73700f12ba

chart2/source/controller/main/ChartController.cxx

@@ -1301,7 +1301,7 @@ void SAL_CALL ChartController::executeDispatch_ChartType()
 
 void SAL_CALL ChartController::executeDispatch_SourceData()
 {
-git gr    //convert properties to ItemSet
+    //convert properties to ItemSet
     uno::Reference< XChartDocument >   xChartDoc( getModel(), uno::UNO_QUERY );
     OSL_ENSURE( xChartDoc.is(), "Invalid XChartDocument" );
     if( !xChartDoc.is())

chart2/source/controller/main/ControllerCommandDispatch.cxx

@@ -242,12 +242,12 @@ void ControllerState::update(
                     if( xRegCurveCnt.is())
                     {
                         uno::Reference< chart2::XRegressionCurve > xRegCurve( RegressionCurveHelper::getFirstCurveNotMeanValueLine( xRegCurveCnt ) );
-                        bMayFormatTrendline = bMayDeleteTrendline = xRegCurve.is();
+                        // Trendline
+                        bMayAddTrendline = true;
+
+                        // Mean Value
                         bMayFormatMeanValue = bMayDeleteMeanValue = RegressionCurveHelper::hasMeanValueLine( xRegCurveCnt );
-                        bMayAddTrendline = ! bMayDeleteTrendline;
                         bMayAddMeanValue = ! bMayDeleteMeanValue;
-                        bMayFormatTrendlineEquation = bMayDeleteTrendlineEquation = RegressionCurveHelper::hasEquation( xRegCurve );
-                        bMayAddTrendlineEquation = !bMayDeleteTrendlineEquation;
                     }
                 }
 
@@ -275,8 +275,11 @@ void ControllerState::update(
             if( aObjectType == OBJECTTYPE_DATA_CURVE )
             {
                 bMayFormatTrendline = true;
+                bMayDeleteTrendline = true;
                 uno::Reference< chart2::XRegressionCurve > xRegCurve(
                     ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ), uno::UNO_QUERY );
+
+                // Trendline Equation
                 bMayFormatTrendlineEquation = bMayDeleteTrendlineEquation = RegressionCurveHelper::hasEquation( xRegCurve );
                 bMayAddTrendlineEquation = !bMayDeleteTrendlineEquation;
             }
@@ -286,10 +289,10 @@ void ControllerState::update(
                 bool bHasR2Value = false;
                 try
                 {
-                    uno::Reference< beans::XPropertySet > xEqProp(
+                    uno::Reference< beans::XPropertySet > xEquationProperties(
                         ObjectIdentifier::getObjectPropertySet( aSelObjCID, xModel ), uno::UNO_QUERY );
-                    if( xEqProp.is())
-                        xEqProp->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value;
+                    if( xEquationProperties.is() )
+                        xEquationProperties->getPropertyValue( "ShowCorrelationCoefficient" ) >>= bHasR2Value;
                 }
                 catch(const uno::RuntimeException& e)
                 {