From f278397787f7b79cee8536e806e8b7113800f2ef Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 21 Jan 2014 15:45:43 +0100 Subject: Change _get_implementation()'s not to do initialization directly. Many of the initalizations (in eg. framework) have to be done on an acquire()'d object, so instead of doing the initialization directly, return the initialization member function back to the createInstance() / createInstanceWithContext() / ... and perform the initialization there. As a sideeffect, I belive the calling initialize() from servicemanager is not that much a hack any more - whoever converts the implementation to be constructor-base has the choice to provide the callback, or still initialize through XInitialization, where the callback is preferred by servicemanager when it exists. Change-Id: I8a87b75c54c1441ca0f184967d31ff4902fc4081 --- svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2 +- svx/source/sdr/primitive2d/primitivefactory2d.cxx | 2 +- svx/source/sidebar/PanelFactory.cxx | 2 +- svx/source/tbxctrls/tbunocontroller.cxx | 2 +- svx/source/tbxctrls/tbunosearchcontrollers.cxx | 14 +++++++------- svx/source/unodraw/UnoGraphicExporter.cxx | 2 +- svx/source/unodraw/recoveryui.cxx | 2 +- svx/source/unodraw/unoctabl.cxx | 2 +- svx/source/unodraw/unoshcol.cxx | 2 +- svx/source/unogallery/unogalthemeprovider.cxx | 2 +- svx/source/xml/xmlgrhlp.cxx | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'svx') diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index dfe1711c4883..6d8e62ab226a 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -492,7 +492,7 @@ Sequence< Reference< drawing::XCustomShapeHandle > > SAL_CALL EnhancedCustomShap extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new EnhancedCustomShapeEngine); } diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index eb5ad2dd6b39..a5dede56473d 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -91,7 +91,7 @@ Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXDrawPage( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new PrimitiveFactory2D); } diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index fb5be3012f37..d8839db828fc 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -207,7 +207,7 @@ Reference SAL_CALL PanelFactory::createUIElement ( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new PanelFactory); } diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 9ab903cf851f..418fab4ee3de 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -442,7 +442,7 @@ void FontHeightToolBoxControl::dispatchCommand( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_svx_FontHeightToolBoxController_get_implementation( css::uno::XComponentContext *rxContext, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new FontHeightToolBoxControl(rxContext)); } diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 120769188b80..19c0adb9ab40 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -1053,7 +1053,7 @@ void SAL_CALL FindbarDispatcher::removeStatusListener( const css::uno::Reference extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_svx_FindTextToolboxController_get_implementation( css::uno::XComponentContext *context, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new FindTextToolbarController(context)); } @@ -1061,7 +1061,7 @@ com_sun_star_svx_FindTextToolboxController_get_implementation( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_svx_ExitFindbarToolboxController_get_implementation( css::uno::XComponentContext *context, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new ExitSearchToolboxController(context)); } @@ -1069,7 +1069,7 @@ com_sun_star_svx_ExitFindbarToolboxController_get_implementation( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_svx_UpSearchToolboxController_get_implementation( css::uno::XComponentContext *context, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new UpDownSearchToolboxController(context, UpDownSearchToolboxController::UP)); } @@ -1077,7 +1077,7 @@ com_sun_star_svx_UpSearchToolboxController_get_implementation( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_svx_DownSearchToolboxController_get_implementation( css::uno::XComponentContext *context, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new UpDownSearchToolboxController(context, UpDownSearchToolboxController::DOWN)); } @@ -1085,7 +1085,7 @@ com_sun_star_svx_DownSearchToolboxController_get_implementation( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_svx_MatchCaseToolboxController_get_implementation( css::uno::XComponentContext *context, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new MatchCaseToolboxController(context)); } @@ -1093,7 +1093,7 @@ com_sun_star_svx_MatchCaseToolboxController_get_implementation( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_svx_FindAllToolboxController_get_implementation( css::uno::XComponentContext *context, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new FindAllToolboxController(context)); } @@ -1101,7 +1101,7 @@ com_sun_star_svx_FindAllToolboxController_get_implementation( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new FindbarDispatcher); } diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index dc7c7f1fe698..6d4c7d318b7b 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -1283,7 +1283,7 @@ Graphic SvxGetGraphicForShape( SdrObject& rShape, bool bVector ) extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_Draw_GraphicExporter_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new GraphicExporter); } diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index ea34f6c1cb10..19142a4601e5 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -423,7 +423,7 @@ void RecoveryUI::impl_showAllRecoveredDocs() extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_svx_RecoveryUI_get_implementation( css::uno::XComponentContext *context, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new RecoveryUI(context)); } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index ec8fcc848d18..6205d0cd4791 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -188,7 +188,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasElements() extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_drawing_SvxUnoColorTable_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new SvxUnoColorTable); } diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index a3d187a2b15d..76f48ad7b2fd 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -272,7 +272,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_drawing_SvxShapeCollection_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new SvxShapeCollection); } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index ece74206b9de..0961198bfe7d 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -234,7 +234,7 @@ void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName ) extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_gallery_GalleryThemeProvider_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new GalleryThemeProvider); } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index c285806682b8..d6c8d26c7a28 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -1053,7 +1053,7 @@ Sequence< OUString > SAL_CALL SvXMLGraphicImportExportHelper::getSupportedServic extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_Svx_GraphicImportHelper_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new SvXMLGraphicImportExportHelper(GRAPHICHELPER_MODE_READ)); } @@ -1073,7 +1073,7 @@ com_sun_star_comp_Svx_GraphicImportHelper_get_implementation( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_Svx_GraphicExportHelper_get_implementation( css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new SvXMLGraphicImportExportHelper(GRAPHICHELPER_MODE_WRITE)); } -- cgit v1.2.3