Use constructors for services from chartcore.component.

Change-Id: I72227b45f305734060a669275044f6f9c8859bc5

38 files changed, 400 insertions, 577 deletions

diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 34406538d72c..c65f2628ef96 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -138,7 +138,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     chart2/source/model/main/Legend \
     chart2/source/model/main/PageBackground \
     chart2/source/model/main/PolarCoordinateSystem \
-    chart2/source/model/main/_serviceregistration_model \
     chart2/source/model/main/StockBar \
     chart2/source/model/main/Title \
     chart2/source/model/main/UndoManager \
@@ -169,7 +168,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     chart2/source/model/template/PieChartTypeTemplate \
     chart2/source/model/template/ScatterChartType \
     chart2/source/model/template/ScatterChartTypeTemplate \
-    chart2/source/model/template/_serviceregistration_charttypes \
     chart2/source/model/template/StockChartTypeTemplate \
     chart2/source/model/template/StockDataInterpreter \
     chart2/source/model/template/XYDataInterpreter \
@@ -232,7 +230,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     chart2/source/tools/ResourceManager \
     chart2/source/tools/Scaling \
     chart2/source/tools/SceneProperties \
-    chart2/source/tools/_serviceregistration_tools \
     chart2/source/tools/StatisticsHelper \
     chart2/source/tools/ThreeDHelper \
     chart2/source/tools/TitleHelper \
diff --git a/chart2/source/chartcore.component b/chart2/source/chartcore.component
index 40296700d080..726274add0c5 100644
--- a/chart2/source/chartcore.component
+++ b/chart2/source/chartcore.component
@@ -18,166 +18,205 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="chartcore" xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.chart2.ExponentialScaling">
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.chart2.ExponentialScaling"
+    constructor="com_sun_star_chart2_ExponentialScaling_get_implementation">
     <service name="com.sun.star.chart2.ExponentialScaling"/>
   </implementation>
-  <implementation name="com.sun.star.chart2.LinearScaling">
+  <implementation name="com.sun.star.chart2.LinearScaling"
+    constructor="com_sun_star_chart2_LinearScaling_get_implementation">
     <service name="com.sun.star.chart2.LinearScaling"/>
   </implementation>
-  <implementation name="com.sun.star.chart2.LogarithmicScaling">
+  <implementation name="com.sun.star.chart2.LogarithmicScaling"
+    constructor="com_sun_star_chart2_LogarithmicScaling_get_implementation">
     <service name="com.sun.star.chart2.LogarithmicScaling"/>
   </implementation>
-  <implementation name="com.sun.star.chart2.PowerScaling">
+  <implementation name="com.sun.star.chart2.PowerScaling"
+    constructor="com_sun_star_chart2_PowerScaling_get_implementation">
     <service name="com.sun.star.chart2.PowerScaling"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.CachedDataSequence">
+  <implementation name="com.sun.star.comp.chart.CachedDataSequence"
+    constructor="com_sun_star_comp_chart_CachedDataSequence_get_implementation">
     <service name="com.sun.star.chart2.data.DataSequence"/>
     <service name="com.sun.star.chart2.data.NumericalDataSequence"/>
     <service name="com.sun.star.chart2.data.TextualDataSequence"/>
     <service name="com.sun.star.comp.chart.CachedDataSequence"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.DataSource">
+  <implementation name="com.sun.star.comp.chart.DataSource"
+    constructor="com_sun_star_comp_chart_DataSource_get_implementation">
     <service name="com.sun.star.chart2.data.DataSource"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.InternalDataProvider">
+  <implementation name="com.sun.star.comp.chart.InternalDataProvider"
+    constructor="com_sun_star_comp_chart_InternalDataProvider_get_implementation">
     <service name="com.sun.star.chart2.data.DataProvider"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.ConfigDefaultColorScheme">
+  <implementation name="com.sun.star.comp.chart2.ConfigDefaultColorScheme"
+    constructor="com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation">
     <service name="com.sun.star.chart2.ColorScheme"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.ErrorBar">
+  <implementation name="com.sun.star.comp.chart2.ErrorBar"
+    constructor="com_sun_star_comp_chart2_ErrorBar_get_implementation">
     <service name="com.sun.star.chart2.ErrorBar"/>
     <service name="com.sun.star.comp.chart2.ErrorBar"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.ExponentialRegressionCurve">
+  <implementation name="com.sun.star.comp.chart2.ExponentialRegressionCurve"
+    constructor="com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation">
     <service name="com.sun.star.chart2.ExponentialRegressionCurve"/>
     <service name="com.sun.star.chart2.RegressionCurve"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.LabeledDataSequence">
+  <implementation name="com.sun.star.comp.chart2.LabeledDataSequence"
+    constructor="com_sun_star_comp_chart2_LabeledDataSequence_get_implementation">
     <service name="com.sun.star.chart2.data.LabeledDataSequence"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.LinearRegressionCurve">
+  <implementation name="com.sun.star.comp.chart2.LinearRegressionCurve"
+    constructor="com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation">
     <service name="com.sun.star.chart2.LinearRegressionCurve"/>
     <service name="com.sun.star.chart2.RegressionCurve"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.LogarithmicRegressionCurve">
+  <implementation name="com.sun.star.comp.chart2.LogarithmicRegressionCurve"
+    constructor="com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation">
     <service name="com.sun.star.chart2.LogarithmicRegressionCurve"/>
     <service name="com.sun.star.chart2.RegressionCurve"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.MeanValueRegressionCurve">
+  <implementation name="com.sun.star.comp.chart2.MeanValueRegressionCurve"
+    constructor="com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation">
     <service name="com.sun.star.chart2.MeanValueRegressionCurve"/>
     <service name="com.sun.star.chart2.RegressionCurve"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.PotentialRegressionCurve">
+  <implementation name="com.sun.star.comp.chart2.PotentialRegressionCurve"
+    constructor="com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation">
     <service name="com.sun.star.chart2.PotentialRegressionCurve"/>
     <service name="com.sun.star.chart2.RegressionCurve"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.PolynomialRegressionCurve">
+  <implementation name="com.sun.star.comp.chart2.PolynomialRegressionCurve"
+    constructor="com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation">
     <service name="com.sun.star.chart2.PolynomialRegressionCurve"/>
     <service name="com.sun.star.chart2.RegressionCurve"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.MovingAverageRegressionCurve">
+  <implementation name="com.sun.star.comp.chart2.MovingAverageRegressionCurve"
+    constructor="com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation">
     <service name="com.sun.star.chart2.MovingAverageRegressionCurve"/>
     <service name="com.sun.star.chart2.RegressionCurve"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.RegressionEquation">
+  <implementation name="com.sun.star.comp.chart2.RegressionEquation"
+    constructor="com_sun_star_comp_chart2_RegressionEquation_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.RegressionEquation"/>
     <service name="com.sun.star.drawing.FillProperties"/>
     <service name="com.sun.star.drawing.LineProperties"/>
     <service name="com.sun.star.style.CharacterProperties"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.AreaChartType">
+  <implementation name="com.sun.star.comp.chart.AreaChartType"
+    constructor="com_sun_star_comp_chart_AreaChartType_get_implementation">
     <service name="com.sun.star.chart2.AreaChartType"/>
     <service name="com.sun.star.chart2.ChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.BarChartType">
+  <implementation name="com.sun.star.comp.chart.BarChartType"
+    constructor="com_sun_star_comp_chart_BarChartType_get_implementation">
     <service name="com.sun.star.chart2.BarChartType"/>
     <service name="com.sun.star.chart2.ChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.BubbleChartType">
+  <implementation name="com.sun.star.comp.chart.BubbleChartType"
+    constructor="com_sun_star_comp_chart_BubbleChartType_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.BubbleChartType"/>
     <service name="com.sun.star.chart2.ChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.GL3DBarChartType">
+  <implementation name="com.sun.star.comp.chart.GL3DBarChartType"
+    constructor="com_sun_star_comp_chart_GL3DBarChartType_get_implementation">
     <service name="com.sun.star.chart2.GL3DBarChartType"/>
     <service name="com.sun.star.chart2.ChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.CandleStickChartType">
+  <implementation name="com.sun.star.comp.chart.CandleStickChartType"
+    constructor="com_sun_star_comp_chart_CandleStickChartType_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.CandleStickChartType"/>
     <service name="com.sun.star.chart2.ChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.ChartTypeManager">
+  <implementation name="com.sun.star.comp.chart.ChartTypeManager"
+    constructor="com_sun_star_comp_chart_ChartTypeManager_get_implementation">
     <service name="com.sun.star.chart2.ChartTypeManager"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.ColumnChartType">
+  <implementation name="com.sun.star.comp.chart.ColumnChartType"
+    constructor="com_sun_star_comp_chart_ColumnChartType_get_implementation">
     <service name="com.sun.star.chart2.ChartType"/>
     <service name="com.sun.star.chart2.ColumnChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.DataSeries">
+  <implementation name="com.sun.star.comp.chart.DataSeries"
+    constructor="com_sun_star_comp_chart_DataSeries_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.DataPointProperties"/>
     <service name="com.sun.star.chart2.DataSeries"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.FilledNetChartType">
+  <implementation name="com.sun.star.comp.chart.FilledNetChartType"
+    constructor="com_sun_star_comp_chart_FilledNetChartType_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.ChartType"/>
     <service name="com.sun.star.chart2.FilledNetChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.FormattedString">
+  <implementation name="com.sun.star.comp.chart.FormattedString"
+    constructor="com_sun_star_comp_chart_FormattedString_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.FormattedString"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.LineChartType">
+  <implementation name="com.sun.star.comp.chart.LineChartType"
+    constructor="com_sun_star_comp_chart_LineChartType_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.ChartType"/>
     <service name="com.sun.star.chart2.LineChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.NetChartType">
+  <implementation name="com.sun.star.comp.chart.NetChartType"
+    constructor="com_sun_star_comp_chart_NetChartType_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.ChartType"/>
     <service name="com.sun.star.chart2.NetChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.PieChartType">
+  <implementation name="com.sun.star.comp.chart.PieChartType"
+    constructor="com_sun_star_comp_chart_PieChartType_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.ChartType"/>
     <service name="com.sun.star.chart2.PieChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart.ScatterChartType">
+  <implementation name="com.sun.star.comp.chart.ScatterChartType"
+    constructor="com_sun_star_comp_chart_ScatterChartType_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.ChartType"/>
     <service name="com.sun.star.chart2.ScatterChartType"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.Axis">
+  <implementation name="com.sun.star.comp.chart2.Axis"
+    constructor="com_sun_star_comp_chart2_Axis_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.Axis"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.CartesianCoordinateSystem2d">
+  <implementation name="com.sun.star.comp.chart2.CartesianCoordinateSystem2d"
+    constructor="com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation">
     <service name="com.sun.star.chart2.CartesianCoordinateSystem2d"/>
     <service name="com.sun.star.chart2.CoordinateSystems.Cartesian"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.CartesianCoordinateSystem3d">
+  <implementation name="com.sun.star.comp.chart2.CartesianCoordinateSystem3d"
+    constructor="com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation">
     <service name="com.sun.star.chart2.CartesianCoordinateSystem3d"/>
     <service name="com.sun.star.chart2.CoordinateSystems.Cartesian"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.ChartModel">
+  <implementation name="com.sun.star.comp.chart2.ChartModel"
+    constructor="com_sun_star_comp_chart2_ChartModel_get_implementation">
     <service name="com.sun.star.chart.ChartDocument"/>
     <service name="com.sun.star.chart2.ChartDocument"/>
     <service name="com.sun.star.document.OfficeDocument"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.Diagram">
+  <implementation name="com.sun.star.comp.chart2.Diagram"
+    constructor="com_sun_star_comp_chart2_Diagram_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.Diagram"/>
     <service name="com.sun.star.layout.LayoutElement"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.GridProperties">
+  <implementation name="com.sun.star.comp.chart2.GridProperties"
+    constructor="com_sun_star_comp_chart2_GridProperties_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.GridProperties"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.Legend">
+  <implementation name="com.sun.star.comp.chart2.Legend"
+    constructor="com_sun_star_comp_chart2_Legend_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.Legend"/>
     <service name="com.sun.star.drawing.FillProperties"/>
@@ -185,29 +224,35 @@
     <service name="com.sun.star.layout.LayoutElement"/>
     <service name="com.sun.star.style.CharacterProperties"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.PageBackground">
+  <implementation name="com.sun.star.comp.chart2.PageBackground"
+    constructor="com_sun_star_comp_chart2_PageBackground_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.PageBackground"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.PolarCoordinateSystem2d">
+  <implementation name="com.sun.star.comp.chart2.PolarCoordinateSystem2d"
+    constructor="com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation">
     <service name="com.sun.star.chart2.CoordinateSystems.Polar"/>
     <service name="com.sun.star.chart2.PolarCoordinateSystem2d"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.PolarCoordinateSystem3d">
+  <implementation name="com.sun.star.comp.chart2.PolarCoordinateSystem3d"
+    constructor="com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation">
     <service name="com.sun.star.chart2.CoordinateSystems.Polar"/>
     <service name="com.sun.star.chart2.PolarCoordinateSystem3d"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.Title">
+  <implementation name="com.sun.star.comp.chart2.Title"
+    constructor="com_sun_star_comp_chart2_Title_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart2.Title"/>
     <service name="com.sun.star.layout.LayoutElement"/>
     <service name="com.sun.star.style.ParagraphProperties"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.XMLFilter">
+  <implementation name="com.sun.star.comp.chart2.XMLFilter"
+    constructor="com_sun_star_comp_chart2_XMLFilter_get_implementation">
     <service name="com.sun.star.document.ExportFilter"/>
     <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.report.XMLFilter">
+  <implementation name="com.sun.star.comp.chart2.report.XMLFilter"
+    constructor="com_sun_star_comp_chart2_XMLFilter_get_implementation">
     <service name="com.sun.star.document.ExportFilter"/>
     <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index cd5dac49a494..cbce9a3c1802 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -814,4 +814,11 @@ OUString XMLReportFilterHelper::getMediaType(bool )
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_XMLFilter_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::XMLFilter(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 428e75afe387..663fd405b9eb 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -663,4 +663,11 @@ css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames()
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_Axis_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::Axis(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 47b7b0c9fc52..5d44bf12288d 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -200,4 +200,18 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupporte
 
 }  // namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_CartesianCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::CartesianCoordinateSystem2d(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_CartesianCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::CartesianCoordinateSystem3d(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 4dddbdfd8c84..80b549439639 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1461,4 +1461,11 @@ void ChartModel::update()
 
 }  // namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ChartModel_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::ChartModel(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 393c279e2d96..3cf89fa952d7 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -602,4 +602,11 @@ css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames()
 
 }  // namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_DataSeries_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::DataSeries(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index a01657078c75..a11cf12539b2 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -771,4 +771,11 @@ css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames()
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_Diagram_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::Diagram(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index 8ecfb0291d07..e4d9c50491ff 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -266,4 +266,11 @@ css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceName
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_FormattedString_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::FormattedString(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index ce6a950c5333..a5a0118b3f5d 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -275,4 +275,11 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridProperties, GridProperties_Base, ::propert
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_GridProperties_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::GridProperties(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 164612e91ad6..37c457a3693d 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -333,4 +333,11 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Legend, Legend_Base, ::property::OPropertySet
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_Legend_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::Legend(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index e2c766102626..0cd7544bd500 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -253,4 +253,11 @@ IMPLEMENT_FORWARD_XINTERFACE2( PageBackground, PageBackground_Base, ::property::
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_PageBackground_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::PageBackground(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index ca75de53a49b..fe6e8c9cc95c 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -200,4 +200,18 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedSer
 
 }  // namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_PolarCoordinateSystem2d_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::PolarCoordinateSystem2d(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_PolarCoordinateSystem3d_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::PolarCoordinateSystem3d(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 2a9b1caec081..1111d93eb6fb 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -406,4 +406,11 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Title, Title_Base, ::property::OPropertySet )
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_Title_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::Title(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx
deleted file mode 100644
index 0245532004ca..000000000000
--- a/chart2/source/model/main/_serviceregistration_model.cxx
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cppuhelper/implementationentry.hxx>
-#include "ChartModel.hxx"
-
-#include "Diagram.hxx"
-#include "Legend.hxx"
-#include "Axis.hxx"
-#include "GridProperties.hxx"
-#include "Title.hxx"
-#include "FormattedString.hxx"
-#include "PageBackground.hxx"
-#include "DataSeries.hxx"
-#include "PolarCoordinateSystem.hxx"
-#include "CartesianCoordinateSystem.hxx"
-
-#include "ChartTypeManager.hxx"
-#include "XMLFilter.hxx"
-
-#include "_serviceregistration_charttypes.hxx"
-#include "charttoolsdllapi.hxx"
-
-static const struct ::cppu::ImplementationEntry g_entries_chart2_model[] =
-{
-    {
-          ::chart::ChartModel::create
-        , ::chart::ChartModel::getImplementationName_Static
-        , ::chart::ChartModel::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::Diagram::create
-        , ::chart::Diagram::getImplementationName_Static
-        , ::chart::Diagram::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::Legend::create
-        , ::chart::Legend::getImplementationName_Static
-        , ::chart::Legend::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::Axis::create
-        , ::chart::Axis::getImplementationName_Static
-        , ::chart::Axis::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::GridProperties::create
-        , ::chart::GridProperties::getImplementationName_Static
-        , ::chart::GridProperties::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::Title::create
-        , ::chart::Title::getImplementationName_Static
-        , ::chart::Title::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-
-    ,{
-          ::chart::FormattedString::create
-        , ::chart::FormattedString::getImplementationName_Static
-        , ::chart::FormattedString::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-
-    ,{
-          ::chart::ChartTypeManager::create
-        , ::chart::ChartTypeManager::getImplementationName_Static
-        , ::chart::ChartTypeManager::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-     ,{
-          ::chart::PageBackground::create
-        , ::chart::PageBackground::getImplementationName_Static
-        , ::chart::PageBackground::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-     ,{
-          ::chart::DataSeries::create
-        , ::chart::DataSeries::getImplementationName_Static
-        , ::chart::DataSeries::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-     ,{
-          ::chart::XMLFilter::create
-        , ::chart::XMLFilter::getImplementationName_Static
-        , ::chart::XMLFilter::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-     ,{
-          ::chart::XMLReportFilterHelper::create
-        , ::chart::XMLReportFilterHelper::getImplementationName_Static
-        , ::chart::XMLFilter::getSupportedServiceNames_Static // we support the same, because we are derived from
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-     ,{
-          ::chart::PolarCoordinateSystem2d::create
-        , ::chart::PolarCoordinateSystem2d::getImplementationName_Static
-        , ::chart::PolarCoordinateSystem2d::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-     ,{
-          ::chart::PolarCoordinateSystem3d::create
-        , ::chart::PolarCoordinateSystem3d::getImplementationName_Static
-        , ::chart::PolarCoordinateSystem3d::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-     ,{
-          ::chart::CartesianCoordinateSystem2d::create
-        , ::chart::CartesianCoordinateSystem2d::getImplementationName_Static
-        , ::chart::CartesianCoordinateSystem2d::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-     ,{
-          ::chart::CartesianCoordinateSystem3d::create
-        , ::chart::CartesianCoordinateSystem3d::getImplementationName_Static
-        , ::chart::CartesianCoordinateSystem3d::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{ 0, 0, 0, 0, 0, 0 }
-};
-
-// component exports
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcore_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
-    void * pResult = ::cppu::component_getFactoryHelper(
-        pImplName, pServiceManager, pRegistryKey, g_entries_chart2_model );
-
-    if( ! pResult )
-        pResult = ::cppu::component_getFactoryHelper(
-            pImplName, pServiceManager, pRegistryKey,
-            ChartTypeEntriesForServiceRegistration::getImplementationEntries() );
-    if (!pResult)
-    {
-        pResult = charttools_component_getFactory(
-            pImplName, pServiceManager, pRegistryKey);
-    }
-
-    return pResult;
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index 8446109ef0f5..e9e057f1e490 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -87,4 +87,11 @@ css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames(
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_AreaChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::AreaChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx
index 587fc6310b39..d7423110a126 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -98,4 +98,11 @@ css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames()
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_BarChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::BarChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 13cc1876b4a0..f9724f7e7109 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -249,4 +249,11 @@ css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceName
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_BubbleChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::BubbleChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 85660ee85099..fc6baa6c1225 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -362,4 +362,11 @@ css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServic
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_CandleStickChartType_get_implementation(css::uno::XComponentContext *context,
+                                                         css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::CandleStickChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 7c68a5908438..1425813c0f54 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -638,4 +638,11 @@ css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNam
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_ChartTypeManager_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::ChartTypeManager(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index 6ad30b9b7c81..4f8734c236e6 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -220,4 +220,11 @@ css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceName
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_ColumnChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::ColumnChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index c597f4280283..d62e9b00b493 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -103,4 +103,11 @@ css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceN
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_FilledNetChartType_get_implementation(css::uno::XComponentContext *context,
+                                                         css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::FilledNetChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx
index 69d8bfc4d53a..8eda8703fa18 100644
--- a/chart2/source/model/template/GL3DBarChartType.cxx
+++ b/chart2/source/model/template/GL3DBarChartType.cxx
@@ -176,4 +176,11 @@ css::uno::Reference<css::beans::XPropertySetInfo> GL3DBarChartType::getPropertyS
 
 }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_GL3DBarChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::GL3DBarChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index 8225d68524b6..a565baab69c8 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -225,4 +225,11 @@ css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames(
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_LineChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::LineChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index 0047d33478a9..fc745a6077a1 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -207,4 +207,11 @@ css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames()
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_NetChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::NetChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index d858675bd72c..a3e9d0b34f67 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -265,4 +265,11 @@ css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames()
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_PieChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::PieChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index a198ebe409b8..2e7b79cd8ff6 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -285,4 +285,11 @@ css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNam
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_ScatterChartType_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::ScatterChartType(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/template/_serviceregistration_charttypes.cxx b/chart2/source/model/template/_serviceregistration_charttypes.cxx
deleted file mode 100644
index 52b829b56f71..000000000000
--- a/chart2/source/model/template/_serviceregistration_charttypes.cxx
+++ /dev/null
@@ -1,137 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "_serviceregistration_charttypes.hxx"
-
-#include "AreaChartType.hxx"
-#include "BarChartType.hxx"
-#include "CandleStickChartType.hxx"
-#include "ColumnChartType.hxx"
-#include "GL3DBarChartType.hxx"
-#include "LineChartType.hxx"
-#include "NetChartType.hxx"
-#include "FilledNetChartType.hxx"
-#include "PieChartType.hxx"
-#include "ScatterChartType.hxx"
-#include "BubbleChartType.hxx"
-
-namespace
-{
-static const struct ::cppu::ImplementationEntry g_entries_chart2_charttypes[] =
-{
-    {
-          ::chart::AreaChartType::create
-        , ::chart::AreaChartType::getImplementationName_Static
-        , ::chart::AreaChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::BarChartType::create
-        , ::chart::BarChartType::getImplementationName_Static
-        , ::chart::BarChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::CandleStickChartType::create
-        , ::chart::CandleStickChartType::getImplementationName_Static
-        , ::chart::CandleStickChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::ColumnChartType::create
-        , ::chart::ColumnChartType::getImplementationName_Static
-        , ::chart::ColumnChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::LineChartType::create
-        , ::chart::LineChartType::getImplementationName_Static
-        , ::chart::LineChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::NetChartType::create
-        , ::chart::NetChartType::getImplementationName_Static
-        , ::chart::NetChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::FilledNetChartType::create
-        , ::chart::FilledNetChartType::getImplementationName_Static
-        , ::chart::FilledNetChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::PieChartType::create
-        , ::chart::PieChartType::getImplementationName_Static
-        , ::chart::PieChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::ScatterChartType::create
-        , ::chart::ScatterChartType::getImplementationName_Static
-        , ::chart::ScatterChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-        ,{
-          ::chart::BubbleChartType::create
-        , ::chart::BubbleChartType::getImplementationName_Static
-        , ::chart::BubbleChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{
-          ::chart::GL3DBarChartType::create
-        , ::chart::GL3DBarChartType::getImplementationName_Static
-        , ::chart::GL3DBarChartType::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{ 0, 0, 0, 0, 0, 0 }
-};
-
-} // anonymous namespace
-
-const struct ::cppu::ImplementationEntry *
-    ChartTypeEntriesForServiceRegistration::getImplementationEntries()
-{
-    return g_entries_chart2_charttypes;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 36897f529480..a45dc907a3ae 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -394,4 +394,11 @@ void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _
 }
 }  // namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_CachedDataSequence_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new chart::CachedDataSequence(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 9d8e1a4151ac..8b42c9c019db 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -203,4 +203,11 @@ css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNa
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ConfigDefaultColorScheme_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::ConfigColorScheme(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index a8a38532dd69..39c5b6462314 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -95,4 +95,11 @@ css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames()
 
 } // namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_DataSource_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::DataSource(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 2173542ac064..19f086eaf7d0 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -497,4 +497,11 @@ using impl::ErrorBar_Base;
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ErrorBar_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::ErrorBar(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 46c391835cdf..db8f2da7acac 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1575,4 +1575,11 @@ css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServic
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart_InternalDataProvider_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::InternalDataProvider(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 3d9660aa3ce1..85fab94f6292 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -183,4 +183,11 @@ css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedService
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_LabeledDataSequence_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::LabeledDataSequence(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 2d8509c2e42b..87e5c01005fc 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -683,4 +683,54 @@ uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::create
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ExponentialRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::ExponentialRegressionCurve(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_LinearRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::LinearRegressionCurve(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_LogarithmicRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::LogarithmicRegressionCurve(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_MeanValueRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::MeanValueRegressionCurve(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_PotentialRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::PotentialRegressionCurve(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_PolynomialRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::PolynomialRegressionCurve(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_MovingAverageRegressionCurve_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::MovingAverageRegressionCurve(context));
+}
+
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 933d2678b7bf..5cad641f7050 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -345,4 +345,11 @@ IMPLEMENT_FORWARD_XINTERFACE2( RegressionEquation, RegressionEquation_Base, ::pr
 
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_RegressionEquation_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::RegressionEquation(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 43ff6cd964a5..87237d0154af 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -324,4 +324,32 @@ css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames()
 
 } //namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_chart2_LinearScaling_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new chart::LinearScaling(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_chart2_ExponentialScaling_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new chart::ExponentialScaling(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_chart2_LogarithmicScaling_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new chart::LogarithmicScaling(context));
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_chart2_PowerScaling_get_implementation(css::uno::XComponentContext *context,
+        css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new chart::PowerScaling(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/_serviceregistration_tools.cxx b/chart2/source/tools/_serviceregistration_tools.cxx
deleted file mode 100644
index c50f46118c32..000000000000
--- a/chart2/source/tools/_serviceregistration_tools.cxx
+++ /dev/null
@@ -1,193 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <cppuhelper/implementationentry.hxx>
-#include "LabeledDataSequence.hxx"
-#include "CachedDataSequence.hxx"
-#include "DataSource.hxx"
-#include "ConfigColorScheme.hxx"
-#include "Scaling.hxx"
-#include "ErrorBar.hxx"
-#include "RegressionCurveModel.hxx"
-#include "RegressionEquation.hxx"
-#include "InternalDataProvider.hxx"
-#include "charttoolsdllapi.hxx"
-
-static const struct ::cppu::ImplementationEntry g_entries_chart2_tools[] =
-{
-    {
-          ::chart::LabeledDataSequence::create
-        , ::chart::LabeledDataSequence::getImplementationName_Static
-        , ::chart::LabeledDataSequence::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::CachedDataSequence::create
-        , ::chart::CachedDataSequence::getImplementationName_Static
-        , ::chart::CachedDataSequence::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::DataSource::create
-        , ::chart::DataSource::getImplementationName_Static
-        , ::chart::DataSource::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::ConfigColorScheme::create
-        , ::chart::ConfigColorScheme::getImplementationName_Static
-        , ::chart::ConfigColorScheme::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-
-    ,{
-          ::chart::LogarithmicScaling::create
-        , ::chart::LogarithmicScaling::getImplementationName_Static
-        , ::chart::LogarithmicScaling::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::ExponentialScaling::create
-        , ::chart::ExponentialScaling::getImplementationName_Static
-        , ::chart::ExponentialScaling::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::LinearScaling::create
-        , ::chart::LinearScaling::getImplementationName_Static
-        , ::chart::LinearScaling::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::PowerScaling::create
-        , ::chart::PowerScaling::getImplementationName_Static
-        , ::chart::PowerScaling::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::ErrorBar::create
-        , ::chart::ErrorBar::getImplementationName_Static
-        , ::chart::ErrorBar::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::MeanValueRegressionCurve::create
-        , ::chart::MeanValueRegressionCurve::getImplementationName_Static
-        , ::chart::MeanValueRegressionCurve::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::LinearRegressionCurve::create
-        , ::chart::LinearRegressionCurve::getImplementationName_Static
-        , ::chart::LinearRegressionCurve::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::LogarithmicRegressionCurve::create
-        , ::chart::LogarithmicRegressionCurve::getImplementationName_Static
-        , ::chart::LogarithmicRegressionCurve::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::ExponentialRegressionCurve::create
-        , ::chart::ExponentialRegressionCurve::getImplementationName_Static
-        , ::chart::ExponentialRegressionCurve::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::PotentialRegressionCurve::create
-        , ::chart::PotentialRegressionCurve::getImplementationName_Static
-        , ::chart::PotentialRegressionCurve::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::PolynomialRegressionCurve::create
-        , ::chart::PolynomialRegressionCurve::getImplementationName_Static
-        , ::chart::PolynomialRegressionCurve::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::MovingAverageRegressionCurve::create
-        , ::chart::MovingAverageRegressionCurve::getImplementationName_Static
-        , ::chart::MovingAverageRegressionCurve::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::RegressionEquation::create
-        , ::chart::RegressionEquation::getImplementationName_Static
-        , ::chart::RegressionEquation::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{
-          ::chart::InternalDataProvider::create
-        , ::chart::InternalDataProvider::getImplementationName_Static
-        , ::chart::InternalDataProvider::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-   ,{ 0, 0, 0, 0, 0, 0 }
-};
-
-// component exports
-extern "C"
-{
-void * SAL_CALL charttools_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
-    return ::cppu::component_getFactoryHelper(
-        pImplName, pServiceManager, pRegistryKey , g_entries_chart2_tools );
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */