diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-25 10:16:18 +0200 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-04-25 22:35:38 +1000 |
| commit | 4af8e690dc35f99f39ab631a739853d0dc611a8f (patch) | |
| tree | f2b9f19433a5ad298fa988d2d919c74d64694400 | |
| parent | 99c9884520d64e468c70f934f5a1f8079ba66dbf (diff) | |
chart2: use constructor feature for ChartFrameLoader
Change-Id: Ibbbd41a30cd240250720aac7b45d0a394be5230b
3 files changed, 9 insertions, 9 deletions
diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component index ac4d1ae62d2b..a73962208346 100644 --- a/chart2/source/controller/chartcontroller.component +++ b/chart2/source/controller/chartcontroller.component @@ -35,7 +35,8 @@ <service name="com.sun.star.chart2.ChartDocumentWrapper"/> <service name="com.sun.star.xml.UserDefinedAttributesSupplier"/> </implementation> - <implementation name="com.sun.star.comp.chart2.ChartFrameLoader"> + <implementation name="com.sun.star.comp.chart2.ChartFrameLoader" + 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"> diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index dd424a5551ac..e9143553898a 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -187,4 +187,11 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT } //namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_ChartFrameLoader_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence<css::uno::Any> const &) +{ + return cppu::acquire(new chart::ChartFrameLoader(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 da0856089101..bcc32c148058 100644 --- a/chart2/source/controller/main/_serviceregistration_controller.cxx +++ b/chart2/source/controller/main/_serviceregistration_controller.cxx @@ -30,14 +30,6 @@ static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] = { { - ::chart::ChartFrameLoader::create - , ::chart::ChartFrameLoader::getImplementationName_Static - , ::chart::ChartFrameLoader::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ ::chart::CreationWizardUnoDlg::create , ::chart::CreationWizardUnoDlg::getImplementationName_Static , ::chart::CreationWizardUnoDlg::getSupportedServiceNames_Static |