mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

makeAny->Any in cppuhelper..cui

Browse Source 
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>
This commit is contained in:
Noel Grandin
2017-02-24 10:24:14 +02:00
parent 3422dfc1b6
commit 48e83f7be2
21 changed files with 112 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cppuhelper/source/defaultbootstrap.cxx
View File

@@ -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());