chart52: #i89539# remove term 'Regression' from legend

chart2/source/controller/dialogs/Strings_Statistic.src

@@ -51,22 +51,22 @@ String STR_CONTROLTEXT_ERROR_BARS_FROM_DATA
 
 String STR_REGRESSION_LINEAR
 {
-    Text [ en-US ] = "Linear Regression" ;
+    Text [ en-US ] = "Linear (%SERIESNAME)" ;
 };
 String STR_REGRESSION_LOG
 {
-    Text [ en-US ] = "Logarithmic Regression" ;
+    Text [ en-US ] = "Logarithmic (%SERIESNAME)" ;
 };
 String STR_REGRESSION_EXP
 {
-    Text [ en-US ] = "Exponential Regression" ;
+    Text [ en-US ] = "Exponential (%SERIESNAME)" ;
 };
 String STR_REGRESSION_POWER
 {
-    Text [ en-US ] = "Power Regression" ;
+    Text [ en-US ] = "Power (%SERIESNAME)" ;
 };
 
-String STR_STATISTICS_IN_LEGEND
+String STR_REGRESSION_MEAN
 {
-    Text [ en-US ] = "%REGRESSIONCURVE for %SERIESNAME" ;
+    Text [ en-US ] = "Mean (%SERIESNAME)" ;
 };

chart2/source/inc/Strings.hrc

@@ -156,6 +156,7 @@
 #define STR_REGRESSION_LOG                  (RID_APP_START + 136)
 #define STR_REGRESSION_EXP                  (RID_APP_START + 137)
 #define STR_REGRESSION_POWER                (RID_APP_START + 138)
+#define STR_REGRESSION_MEAN                 (RID_APP_START + 180)
 
 //-----------------------------------------------------------------------------
 //for scale tab page
@@ -264,8 +265,6 @@
 #define STR_OBJECT_AVERAGE_LINE_WITH_PARAMETERS (RID_APP_START + 265)
 
 #define STR_OBJECT_CURVE_EQUATION           (RID_APP_START + 268)
-#define STR_STATISTICS_IN_LEGEND            (RID_APP_START + 180)
-
 #define STR_OBJECT_SHAPE                    (RID_APP_START + 290)
 
 //-----------------------------------------------------------------------------

chart2/source/tools/RegressionCurveHelper.cxx

@@ -608,7 +608,7 @@ OUString RegressionCurveHelper::getUINameForRegressionCurve( const Reference< XR
     if( aServiceName.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.MeanValueRegressionCurve" )))
     {
-        aResult = ::chart::SchResId::getResString( STR_OBJECT_AVERAGE_LINE );
+        aResult = ::chart::SchResId::getResString( STR_REGRESSION_MEAN );
     }
     else if( aServiceName.equalsAsciiL(
                  RTL_CONSTASCII_STRINGPARAM( "com.sun.star.chart2.LinearRegressionCurve" )))

chart2/source/view/charttypes/VSeriesPlotter.cxx

@@ -2170,8 +2170,7 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntriesForSeries(
                 if( aCurves[i].is() )
                 {
                     //label
-                    OUString aResStr( SchResId::getResString( STR_STATISTICS_IN_LEGEND ));
-                    replaceParamterInString( aResStr, C2U("%REGRESSIONCURVE"), RegressionCurveHelper::getUINameForRegressionCurve( aCurves[i] ));
+                    OUString aResStr( RegressionCurveHelper::getUINameForRegressionCurve( aCurves[i] ) );
                     replaceParamterInString( aResStr, C2U("%SERIESNAME"), aLabelText );
                     aEntry.aLabel = FormattedStringHelper::createFormattedStringSequence( xContext, aResStr, xTextProperties );