diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 11:19:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-16 12:04:10 +0100 |
| commit | 8512e5c2b3617a2c8d77381788c3864db594ce46 (patch) | |
| tree | c7fde308b180a2bce971fc80958d8bd28aa123d0 /stoc | |
| parent | c7f60050da130eaeab11a53142a65b61c92c34a1 (diff) | |
reduce static_initialization_and_destruction chain
Change-Id: I962aeac0c7feeabb7963016d5afcfeca5a48ccfe
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/security/access_controller.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 15e58ab8475f..c128b4a63e38 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -80,7 +80,7 @@ namespace stoc_sec { // static stuff initialized when loading lib static OUString s_envType = OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME); -static OUString s_acRestriction = OUSTR("access-control.restriction"); +const char s_acRestriction[] = "access-control.restriction"; //################################################################################################## @@ -325,7 +325,7 @@ void acc_CurrentContext::release() Any acc_CurrentContext::getValueByName( OUString const & name ) throw (RuntimeException) { - if (name.equals( s_acRestriction )) + if (name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(s_acRestriction))) { return m_restriction; } @@ -358,7 +358,7 @@ static inline Reference< security::XAccessControlContext > getDynamicRestriction { if (xContext.is()) { - Any acc( xContext->getValueByName( s_acRestriction ) ); + Any acc(xContext->getValueByName(rtl::OUString(s_acRestriction))); if (typelib_TypeClass_INTERFACE == acc.pType->eTypeClass) { // avoid ref-counting @@ -1047,8 +1047,7 @@ Sequence< OUString > ac_getSupportedServiceNames() SAL_THROW(()) //-------------------------------------------------------------------------------------------------- OUString ac_getImplementationName() SAL_THROW(()) { - static OUString s_implName = OUSTR(IMPL_NAME); - return s_implName; + return OUSTR(IMPL_NAME); } //-------------------------------------------------------------------------------------------------- Reference< XInterface > SAL_CALL filepolicy_create( |