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 --- stoc/source/defaultregistry/defaultregistry.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stoc/source/defaultregistry') diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index a5446f2d30f0..2f09bf5309a2 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -1353,7 +1353,7 @@ void SAL_CALL NestedRegistryImpl::mergeKey( const OUString& aKeyName, const OUSt extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_stoc_NestedRegistry_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, - css::uno::Sequence const &) + cppu::constructor_InitializationFunc &) { return static_cast(new NestedRegistryImpl); } -- cgit