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 /framework/source/uifactory | |
| 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 'framework/source/uifactory')
| -rw-r--r-- | framework/source/uifactory/addonstoolboxfactory.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/framework/source/uifactory/addonstoolboxfactory.cxx b/framework/source/uifactory/addonstoolboxfactory.cxx index 992dfb630bc9..8d965e5ffe24 100644 --- a/framework/source/uifactory/addonstoolboxfactory.cxx +++ b/framework/source/uifactory/addonstoolboxfactory.cxx @@ -232,11 +232,9 @@ throw ( ::com::sun::star::container::NoSuchElementException, extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_framework_AddonsToolBarFactory_get_implementation( css::uno::XComponentContext *context, - css::uno::Sequence<css::uno::Any> const &) + cppu::constructor_InitializationFunc &) { - rtl::Reference<AddonsToolBoxFactory> x(new AddonsToolBoxFactory(context)); - x->acquire(); - return static_cast<cppu::OWeakObject *>(x.get()); + return static_cast<cppu::OWeakObject *>(new AddonsToolBoxFactory(context)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |