summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-04-25 10:23:18 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-04-25 10:51:25 +0200
commit50634a20d35d34ddebf74d4f0b99c305a38e7915 (patch)
tree007f3f65572652a55ecab8d27083bbe97518b63c /chart2
parent167cd680848a55d726c1278f025987a2532767a1 (diff)
chart2: use constructor feature for ChartTypeDialog
Change-Id: I5efc89d8d0139216c1ae92aa692704f9f58915ca
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/chartcontroller.component3
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx7
-rw-r--r--chart2/source/controller/main/_serviceregistration_controller.cxx8
3 files changed, 9 insertions, 9 deletions
diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component
index a73962208346..dc2c001b587b 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -39,7 +39,8 @@
constructor="com_sun_star_comp_chart2_ChartFrameLoader_get_implementation">
<service name="com.sun.star.frame.SynchronousFrameLoader"/>
</implementation>
- <implementation name="com.sun.star.comp.chart2.ChartTypeDialog">
+ <implementation name="com.sun.star.comp.chart2.ChartTypeDialog"
+ constructor="com_sun_star_comp_chart2_ChartTypeDialog_get_implementation">
<service name="com.sun.star.chart2.ChartTypeDialog"/>
</implementation>
<implementation name="com.sun.star.comp.chart2.ShapeToolbarController">
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 18502945c8e1..3ca294af9a3b 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -107,4 +107,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySe
} //namespace chart
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ChartTypeDialog_get_implementation(css::uno::XComponentContext *context,
+ css::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new chart::ChartTypeUnoDlg(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
index bcc32c148058..6889e9af6a91 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -38,14 +38,6 @@ static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
, 0
}
,{
- ::chart::ChartTypeUnoDlg::Create
- , ::chart::ChartTypeUnoDlg::getImplementationName_Static
- , ::chart::ChartTypeUnoDlg::getSupportedServiceNames_Static
- , ::cppu::createSingleComponentFactory
- , 0
- , 0
- }
- ,{
::chart::ShapeToolbarController::create
, ::chart::ShapeToolbarController::getImplementationName_Static
, ::chart::ShapeToolbarController::getSupportedServiceNames_Static