From dcdda1d61092aad74cd77023be58ef823b424126 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 16 Jan 2013 09:31:07 +0100
Subject: Unfold remainder of add_access_control_entries at call site

Change-Id: I6e1a5a0223c1ea3e1a8c8800fb4cb032719ecf4f
---
 cppuhelper/source/defaultbootstrap.cxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'cppuhelper/source/defaultbootstrap.cxx')

diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 9b214847b4a5..6032acf95ed3 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -45,7 +45,6 @@
 
 #include "macro_expander.hxx"
 #include "paths.hxx"
-#include "servicefactory_detail.hxx"
 #include "servicemanager.hxx"
 #include "typedescriptionprovider.hxx"
 
@@ -115,7 +114,16 @@ cppu::defaultBootstrap_InitialComponentContext(rtl::OUString const & iniUri)
                 "/singletons/" + i->first,
                 css::uno::makeAny(i->second[0]->info->name), true));
     }
-    cppu::add_access_control_entries(&context_values);
+    context_values.push_back(
+        cppu::ContextEntry_Init(
+            "/services/com.sun.star.security.AccessController/mode",
+            css::uno::makeAny(rtl::OUString("off")), false));
+    context_values.push_back(
+        cppu::ContextEntry_Init(
+            "/singletons/com.sun.star.security.theAccessController",
+            css::uno::makeAny(
+                rtl::OUString("com.sun.star.security.AccessController")),
+            true));
     assert(!context_values.empty());
     css::uno::Reference< css::uno::XComponentContext > context(
         createComponentContext(
-- 
cgit