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 /svx/source/tbxctrls/tbunocontroller.cxx | |
| 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 'svx/source/tbxctrls/tbunocontroller.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 418fab4ee3de..47330431a5b6 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -442,9 +442,9 @@ void FontHeightToolBoxControl::dispatchCommand( extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL com_sun_star_svx_FontHeightToolBoxController_get_implementation( css::uno::XComponentContext *rxContext, - cppu::constructor_InitializationFunc &) + css::uno::Sequence<css::uno::Any> const &) { - return static_cast<cppu::OWeakObject *>(new FontHeightToolBoxControl(rxContext)); + return cppu::acquire(new FontHeightToolBoxControl(rxContext)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |