fdo#46808, Convert chart2::*RegressionCurve services to new style

The service already existed, they just needed IDL files.

Change-Id: I547b3b40912e2fefdb173c010826f86aa8347b11

3 files changed, 14 insertions, 37 deletions

diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index fa7df367a109..e8f88282b614 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1692,16 +1692,16 @@ bool XclExpChSerTrendLine::Convert( Reference< XRegressionCurve > xRegCurve, sal
     // trend line type
     ScfPropertySet aCurveProp( xRegCurve );
     OUString aService = aCurveProp.GetServiceName();
-    if( aService == SERVICE_CHART2_LINEARREGCURVE )
+    if( aService == "com.sun.star.chart2.LinearRegressionCurve" )
     {
         maData.mnLineType = EXC_CHSERTREND_POLYNOMIAL;
         maData.mnOrder = 1;
     }
-    else if( aService == SERVICE_CHART2_EXPREGCURVE )
+    else if( aService == "com.sun.star.chart2.ExponentialRegressionCurve" )
         maData.mnLineType = EXC_CHSERTREND_EXPONENTIAL;
-    else if( aService == SERVICE_CHART2_LOGREGCURVE )
+    else if( aService == "com.sun.star.chart2.LogarithmicRegressionCurve" )
         maData.mnLineType = EXC_CHSERTREND_LOGARITHMIC;
-    else if( aService == SERVICE_CHART2_POTREGCURVE )
+    else if( aService == "com.sun.star.chart2.PotentialRegressionCurve" )
         maData.mnLineType = EXC_CHSERTREND_POWER;
     else
         return false;
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index e36a1473e9a9..cb85b90d4f9c 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -40,6 +40,10 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
+#include <com/sun/star/chart2/LinearRegressionCurve.hpp>
+#include <com/sun/star/chart2/ExponentialRegressionCurve.hpp>
+#include <com/sun/star/chart2/LogarithmicRegressionCurve.hpp>
+#include <com/sun/star/chart2/PotentialRegressionCurve.hpp>
 #include <com/sun/star/chart2/CartesianCoordinateSystem2d.hpp>
 #include <com/sun/star/chart2/CartesianCoordinateSystem3d.hpp>
 #include <com/sun/star/chart2/FormattedString.hpp>
@@ -104,27 +108,7 @@ using ::com::sun::star::drawing::XDrawPage;
 using ::com::sun::star::drawing::XDrawPageSupplier;
 using ::com::sun::star::drawing::XShape;
 
-using ::com::sun::star::chart2::IncrementData;
-using ::com::sun::star::chart2::RelativePosition;
-using ::com::sun::star::chart2::RelativeSize;
-using ::com::sun::star::chart2::ScaleData;
-using ::com::sun::star::chart2::SubIncrement;
-using ::com::sun::star::chart2::XAxis;
-using ::com::sun::star::chart2::XChartDocument;
-using ::com::sun::star::chart2::XChartType;
-using ::com::sun::star::chart2::XChartTypeContainer;
-using ::com::sun::star::chart2::XCoordinateSystem;
-using ::com::sun::star::chart2::XCoordinateSystemContainer;
-using ::com::sun::star::chart2::XDataSeries;
-using ::com::sun::star::chart2::XDataSeriesContainer;
-using ::com::sun::star::chart2::XDiagram;
-using ::com::sun::star::chart2::XFormattedString;
-using ::com::sun::star::chart2::XLegend;
-using ::com::sun::star::chart2::XRegressionCurve;
-using ::com::sun::star::chart2::XRegressionCurveContainer;
-using ::com::sun::star::chart2::XScaling;
-using ::com::sun::star::chart2::XTitle;
-using ::com::sun::star::chart2::XTitled;
+using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::chart2::data::XDataProvider;
 using ::com::sun::star::chart2::data::XDataReceiver;
@@ -1627,27 +1611,24 @@ void XclImpChSerTrendLine::ReadChSerTrendLine( XclImpStream& rStrm )
 Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() const
 {
     // trend line type
-    OUString aService;
+    Reference< XRegressionCurve > xRegCurve;
     switch( maData.mnLineType )
     {
         case EXC_CHSERTREND_POLYNOMIAL:
             // TODO: only linear trend lines are supported by OOChart (#i20819#)
             if( maData.mnOrder == 1 )
-                aService = SERVICE_CHART2_LINEARREGCURVE;
+                xRegCurve = LinearRegressionCurve::create( comphelper::getProcessComponentContext() );
         break;
         case EXC_CHSERTREND_EXPONENTIAL:
-            aService = SERVICE_CHART2_EXPREGCURVE;
+            xRegCurve = ExponentialRegressionCurve::create( comphelper::getProcessComponentContext() );
         break;
         case EXC_CHSERTREND_LOGARITHMIC:
-            aService = SERVICE_CHART2_LOGREGCURVE;
+            xRegCurve = LogarithmicRegressionCurve::create( comphelper::getProcessComponentContext() );
         break;
         case EXC_CHSERTREND_POWER:
-            aService = SERVICE_CHART2_POTREGCURVE;
+            xRegCurve = PotentialRegressionCurve::create( comphelper::getProcessComponentContext() );
         break;
     }
-    Reference< XRegressionCurve > xRegCurve;
-    if( !aService.isEmpty() )
-        xRegCurve.set( ScfApiHelper::CreateInstance( aService ), UNO_QUERY );
 
     // trend line formatting
     if( xRegCurve.is() && mxDataFmt )
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index 4e3eb948b522..828d67795dfe 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -53,11 +53,7 @@ class XclRoot;
 #define SERVICE_CHART2_DATASERIES           "com.sun.star.chart2.DataSeries"
 #define SERVICE_CHART2_DIAGRAM              "com.sun.star.chart2.Diagram"
 #define SERVICE_CHART2_ERRORBAR             "com.sun.star.chart2.ErrorBar"
-#define SERVICE_CHART2_EXPREGCURVE          "com.sun.star.chart2.ExponentialRegressionCurve"
 #define SERVICE_CHART2_LEGEND               "com.sun.star.chart2.Legend"
-#define SERVICE_CHART2_LINEARREGCURVE       "com.sun.star.chart2.LinearRegressionCurve"
-#define SERVICE_CHART2_LOGREGCURVE          "com.sun.star.chart2.LogarithmicRegressionCurve"
-#define SERVICE_CHART2_POTREGCURVE          "com.sun.star.chart2.PotentialRegressionCurve"
 
 // property names
 #define EXC_CHPROP_ADDITIONALSHAPES         "AdditionalShapes"