diff options
Diffstat (limited to 'svx/source/tbxctrls/tbunosearchcontrollers.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbunosearchcontrollers.cxx | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index b3fdbfbf8c7f..05c6bfe80d8c 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -39,6 +39,7 @@ #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> +#include <rtl/ref.hxx> #include <rtl/instance.hxx> using namespace css; @@ -1054,10 +1055,9 @@ com_sun_star_svx_FindTextToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new FindTextToolbarController(context))); + rtl::Reference<FindTextToolbarController> x(new FindTextToolbarController(context)); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL @@ -1065,10 +1065,9 @@ com_sun_star_svx_ExitFindbarToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new ExitSearchToolboxController(context))); + rtl::Reference<ExitSearchToolboxController> x(new ExitSearchToolboxController(context)); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL @@ -1076,11 +1075,10 @@ com_sun_star_svx_UpSearchToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new UpDownSearchToolboxController( - context, UpDownSearchToolboxController::UP ))); + rtl::Reference<UpDownSearchToolboxController> x(new UpDownSearchToolboxController( + context, UpDownSearchToolboxController::UP)); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL @@ -1088,11 +1086,10 @@ com_sun_star_svx_DownSearchToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new UpDownSearchToolboxController( - context, UpDownSearchToolboxController::DOWN ))); + rtl::Reference<UpDownSearchToolboxController> x(new UpDownSearchToolboxController( + context, UpDownSearchToolboxController::DOWN)); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL @@ -1100,10 +1097,9 @@ com_sun_star_svx_MatchCaseToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new MatchCaseToolboxController(context))); + rtl::Reference<MatchCaseToolboxController> x(new MatchCaseToolboxController(context)); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL @@ -1111,10 +1107,9 @@ com_sun_star_svx_FindAllToolboxController_get_implementation( css::uno::XComponentContext *context, css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new FindAllToolboxController(context))); + rtl::Reference<FindAllToolboxController> x(new FindAllToolboxController(context)); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL @@ -1122,10 +1117,9 @@ com_sun_star_comp_svx_Impl_FindbarDispatcher_get_implementation( SAL_UNUSED_PARAMETER css::uno::XComponentContext *, css::uno::Sequence<css::uno::Any> const &) { - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new FindbarDispatcher)); + rtl::Reference<FindbarDispatcher> x(new FindbarDispatcher); x->acquire(); - return x.get(); + return static_cast<cppu::OWeakObject *>(x.get()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |