diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 169c5d9ef7ee..f68cd670d1a5 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1564,4 +1564,11 @@ APPHELPER_XSERVICEINFO_IMPL( ChartDocumentWrapper, CHART_CHARTAPIWRAPPER_IMPLEME
 } //  namespace wrapper
 } //  namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation(css::uno::XComponentContext *context,
+                                                                css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new ::chart::wrapper::ChartDocumentWrapper(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component
index 616b57c17bce..ac4d1ae62d2b 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -28,7 +28,8 @@
     <service name="com.sun.star.chart2.ChartController"/>
     <service name="com.sun.star.frame.Controller"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper">
+  <implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper"
+      constructor="com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation">
     <service name="com.sun.star.beans.PropertySet"/>
     <service name="com.sun.star.chart.ChartDocument"/>
     <service name="com.sun.star.chart2.ChartDocumentWrapper"/>
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx
index 34710bc26ce2..da0856089101 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -53,14 +53,6 @@ static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
         , 0
         , 0
     }
-    ,{
-          ::chart::wrapper::ChartDocumentWrapper::create
-        , ::chart::wrapper::ChartDocumentWrapper::getImplementationName_Static
-        , ::chart::wrapper::ChartDocumentWrapper::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
     ,{
           ::chart::ShapeToolbarController::create
         , ::chart::ShapeToolbarController::getImplementationName_Static