diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-01-22 11:54:19 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-01-22 15:09:28 +0100 |
| commit | c2c530da69152ff9192b9726aa95961803ce9b29 (patch) | |
| tree | 15e514573f35d9f376520fc2c015634dc4ee8c25 /sfx2/source/notify | |
| parent | 219a2939c9f58690356b2a3f64c580a0865fdc64 (diff) | |
Introduce static inline cppu::acquire(), and make use of that.
This is much better approach compared to the callback function, as it allows
passing arguments to the c++ constructor directly, while still allowing some
additional initialization after having acquired the instance.
Change-Id: I5a0f981915dd58f1522ee6054e53a3550b29d624
Diffstat (limited to 'sfx2/source/notify')
| -rw-r--r-- | sfx2/source/notify/globalevents.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 16b7118645bd..de482dcd0746 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -547,9 +547,11 @@ struct Singleton: extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation( css::uno::XComponentContext *context, - cppu::constructor_InitializationFunc &) + css::uno::Sequence<css::uno::Any> const &) { - return Singleton::get(context).instance.get(); + css::uno::XInterface *inst = Singleton::get(context).instance.get(); + inst->acquire(); + return inst; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |