summaryrefslogtreecommitdiff
path: root/stoc/source
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-01-16 09:04:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-01-16 11:39:03 +0100
commite1e308bc4564f596bde5cd4c96b75d3b8c672e95 (patch)
treea3aafe7b01d1e14f27a9a47afcf95bf08b47c818 /stoc/source
parentfb8f3fac70ecfcc2b8612dbf71308cbea39ca789 (diff)
Remove support for UNO_AC* bootstrap variables
...they had effectively never been used. Change-Id: I514f2b844661e144cef758eb3ce7c4607ffad635
Diffstat (limited to 'stoc/source')
-rw-r--r--stoc/source/security/access_controller.cxx4
-rw-r--r--stoc/source/security/file_policy.cxx5
2 files changed, 8 insertions, 1 deletions
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index ae72ae89ac3c..09ffc70cfb32 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -472,6 +472,10 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp
{
g_moduleCount.modCnt.acquire( &g_moduleCount.modCnt );
+ // The .../mode value had originally been set in
+ // cppu::add_access_control_entries (cppuhelper/source/servicefactory.cxx)
+ // to something other than "off" depending on various UNO_AC* bootstrap
+ // variables that are no longer supported, so this is mostly dead code now:
OUString mode;
if (m_xComponentContext->getValueByName( OUSTR("/services/" SERVICE_NAME "/mode") ) >>= mode)
{
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 78647766a2ff..d7fa8c4899d6 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -438,7 +438,10 @@ PolicyReader::~PolicyReader()
void FilePolicy::refresh()
throw (RuntimeException)
{
- // read out file
+ // read out file (the .../file-name value had originally been set in
+ // cppu::add_access_control_entries (cppuhelper/source/servicefactory.cxx)
+ // depending on various UNO_AC* bootstrap variables that are no longer
+ // supported, so this is effectively dead code):
OUString fileName;
m_xComponentContext->getValueByName(
OUSTR("/implementations/" IMPL_NAME "/file-name") ) >>= fileName;