mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chart2: use constructor feature for ChartController

Browse Source 
Change-Id: Ie6c5c0e20ae2b2f38f176dee90c33e5baba100a5
This commit is contained in:
Miklos Vajna
2014-04-25 09:50:43 +02:00
parent 7f01a96099
commit 899c018a2f
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
chart2/source/controller/chartcontroller.component
View File

@@ -23,7 +23,8 @@
constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation"> constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation">
<service name="com.sun.star.frame.ToolbarController"/> <service name="com.sun.star.frame.ToolbarController"/>
</implementation> </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.chart2.ChartController"/>
<service name="com.sun.star.frame.Controller"/> <service name="com.sun.star.frame.Controller"/>
</implementation> </implementation>

8
chart2/source/controller/main/ChartController.cxx
View File

@@ -1555,4 +1555,12 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
} //namespace chart } //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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

8
chart2/source/controller/main/_serviceregistration_controller.cxx
View File

@@ -30,14 +30,6 @@
static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] = 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::create
, ::chart::ChartFrameLoader::getImplementationName_Static , ::chart::ChartFrameLoader::getImplementationName_Static
, ::chart::ChartFrameLoader::getSupportedServiceNames_Static , ::chart::ChartFrameLoader::getSupportedServiceNames_Static