chart2: use constructor feature for WizardDialog

Change-Id: Ifcaae6401f1ad5069248111b568a1cf5c033f5ab

4 files changed, 10 insertions, 57 deletions

diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index b32d840a67df..abc9e5803693 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -182,7 +182,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
     chart2/source/controller/main/ObjectHierarchy \
     chart2/source/controller/main/PositionAndSizeHelper \
     chart2/source/controller/main/SelectionHelper \
-    chart2/source/controller/main/_serviceregistration_controller \
     chart2/source/controller/main/ShapeController \
     chart2/source/controller/main/ShapeToolbarController \
     chart2/source/controller/main/StatusBarCommandDispatch \
diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component
index b21a9012f221..396656db1e1b 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -18,7 +18,7 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="chartcontroller" xmlns="http://openoffice.org/2010/uno-components">
+    xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.chart.ElementSelectorToolbarController"
       constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation">
     <service name="com.sun.star.frame.ToolbarController"/>
@@ -47,7 +47,8 @@
       constructor="com_sun_star_comp_chart2_ShapeToolbarController_get_implementation">
     <service name="com.sun.star.chart2.ShapeToolbarController"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.WizardDialog">
+  <implementation name="com.sun.star.comp.chart2.WizardDialog"
+      constructor="com_sun_star_comp_chart2_WizardDialog_get_implementation">
     <service name="com.sun.star.chart2.WizardDialog"/>
   </implementation>
 </component>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 45d1e01e1ddf..dc3bc33bf364 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -382,4 +382,11 @@ void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString
 
 } //namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_WizardDialog_get_implementation(css::uno::XComponentContext *context,
+                                                         css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new chart::CreationWizardUnoDlg(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx
deleted file mode 100644
index eb5e06e12630..000000000000
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ /dev/null
@@ -1,54 +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 "ChartController.hxx"
-#include "ChartFrameloader.hxx"
-#include "dlg_CreationWizard_UNO.hxx"
-#include "dlg_ChartType_UNO.hxx"
-#include "ChartDocumentWrapper.hxx"
-#include "AccessibleChartView.hxx"
-#include "ElementSelector.hxx"
-#include "ShapeToolbarController.hxx"
-#include <cppuhelper/implementationentry.hxx>
-
-static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
-{
-    {
-          ::chart::CreationWizardUnoDlg::create
-        , ::chart::CreationWizardUnoDlg::getImplementationName_Static
-        , ::chart::CreationWizardUnoDlg::getSupportedServiceNames_Static
-        , ::cppu::createSingleComponentFactory
-        , 0
-        , 0
-    }
-    ,{ 0, 0, 0, 0, 0, 0 }
-};
-
-// component exports
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcontroller_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
-    return ::cppu::component_getFactoryHelper(
-        pImplName, pServiceManager, pRegistryKey , g_entries_chart2_controller );
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */