diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-01-21 15:45:43 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-01-21 21:25:22 +0100 |
| commit | f278397787f7b79cee8536e806e8b7113800f2ef (patch) | |
| tree | 1760bce432d466cf9f3ca444c89ec8f44306ab04 /cppuhelper/source/servicemanager.hxx | |
| parent | 3780738154b8c3b3f9d85c64cccf621d97574886 (diff) | |
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
Diffstat (limited to 'cppuhelper/source/servicemanager.hxx')
| -rw-r--r-- | cppuhelper/source/servicemanager.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cppuhelper/source/servicemanager.hxx b/cppuhelper/source/servicemanager.hxx index a9522a564e5e..2d29f58b48ca 100644 --- a/cppuhelper/source/servicemanager.hxx +++ b/cppuhelper/source/servicemanager.hxx @@ -33,6 +33,7 @@ #include "osl/mutex.hxx" #include "registry/registry.hxx" #include "rtl/ustring.hxx" +#include "cppuhelper/weak.hxx" namespace com { namespace sun { namespace star { namespace lang { class XSingleComponentFactory; @@ -44,7 +45,7 @@ namespace cppuhelper { extern "C" { typedef css::uno::XInterface * SAL_CALL ImplementationConstructorFn( - css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &); + css::uno::XComponentContext *, cppu::constructor_InitializationFunc &); } |