diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-25 09:50:43 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-04-25 10:51:25 +0200 |
| commit | 899c018a2fc586c6e4763b242dff92d1f47bf5b8 (patch) | |
| tree | 3a11450c9131545364801e5dc370770fde86c518 | |
| parent | 7f01a960995b728489ab359fc082609c75216f95 (diff) | |
chart2: use constructor feature for ChartController
Change-Id: Ie6c5c0e20ae2b2f38f176dee90c33e5baba100a5
| -rw-r--r-- | chart2/source/controller/chartcontroller.component | 3 | ||||
| -rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 8 | ||||
| -rw-r--r-- | chart2/source/controller/main/_serviceregistration_controller.cxx | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component index c315a61301d7..616b57c17bce 100644 --- a/chart2/source/controller/chartcontroller.component +++ b/chart2/source/controller/chartcontroller.component @@ -23,7 +23,8 @@ constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation"> <service name="com.sun.star.frame.ToolbarController"/> </implementation> - <implementation name="com.sun.star.comp.chart2.ChartController"> + <implementation name="com.sun.star.comp.chart2.ChartController" + constructor="com_sun_star_comp_chart2_ChartController_get_implementation"> <service name="com.sun.star.chart2.ChartController"/> <service name="com.sun.star.frame.Controller"/> </implementation> diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index aaf3223ba0b1..db433bc62797 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1555,4 +1555,12 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn } //namespace chart +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_chart2_ChartController_get_implementation(css::uno::XComponentContext *context, + css::uno::Sequence<css::uno::Any> const &) +{ + return cppu::acquire(new chart::ChartController(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 ffadb56e03dc..34710bc26ce2 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::ChartController::create - , ::chart::ChartController::getImplementationName_Static - , ::chart::ChartController::getSupportedServiceNames_Static - , ::cppu::createSingleComponentFactory - , 0 - , 0 - } - ,{ ::chart::ChartFrameLoader::create , ::chart::ChartFrameLoader::getImplementationName_Static , ::chart::ChartFrameLoader::getSupportedServiceNames_Static |