diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 10:24:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 09:17:34 +0000 |
| commit | 48e83f7be240cd0af5b9f1ee5b87c4d9376c102e (patch) | |
| tree | 15ccd05d11aca0461309670987ae71316a6232ca /cppuhelper/source/defaultbootstrap.cxx | |
| parent | 3422dfc1b61c15d7d3a6b0e1ee16c50457946cc0 (diff) | |
makeAny->Any in cppuhelper..cui
Change-Id: Ia54e6e9b71df68bd04c304a0bb02da8ebac74420
Reviewed-on: https://gerrit.libreoffice.org/34603
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cppuhelper/source/defaultbootstrap.cxx')
| -rw-r--r-- | cppuhelper/source/defaultbootstrap.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx index f7c909f939c3..9f67fc8d3dd1 100644 --- a/cppuhelper/source/defaultbootstrap.cxx +++ b/cppuhelper/source/defaultbootstrap.cxx @@ -62,32 +62,32 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri) context_values.push_back( cppu::ContextEntry_Init( "/singletons/com.sun.star.lang.theServiceManager", - css::uno::makeAny( + css::uno::Any( css::uno::Reference< css::uno::XInterface >( static_cast< cppu::OWeakObject * >(smgr.get()))), false)); context_values.push_back( cppu::ContextEntry_Init( "/singletons/com.sun.star.reflection.theTypeDescriptionManager", - css::uno::makeAny( + css::uno::Any( css::uno::Reference< css::uno::XInterface >( static_cast< cppu::OWeakObject * >(tmgr.get()))), false)); context_values.push_back( //TODO: from services.rdb? cppu::ContextEntry_Init( "/singletons/com.sun.star.util.theMacroExpander", - css::uno::makeAny( + css::uno::Any( cppuhelper::detail::create_bootstrap_macro_expander_factory()), true)); smgr->addSingletonContextEntries(&context_values); context_values.push_back( cppu::ContextEntry_Init( "/services/com.sun.star.security.AccessController/mode", - css::uno::makeAny(rtl::OUString("off")), false)); + css::uno::Any(rtl::OUString("off")), false)); context_values.push_back( cppu::ContextEntry_Init( "/singletons/com.sun.star.security.theAccessController", - css::uno::makeAny( + css::uno::Any( rtl::OUString("com.sun.star.security.AccessController")), true)); assert(!context_values.empty()); |