diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /stoc/source/security | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'stoc/source/security')
-rw-r--r-- | stoc/source/security/access_controller.cxx | 13 | ||||
-rw-r--r-- | stoc/source/security/lru_cache.h | 12 | ||||
-rw-r--r-- | stoc/source/security/permissions.cxx | 8 | ||||
-rw-r--r-- | stoc/source/security/permissions.h | 6 |
4 files changed, 17 insertions, 22 deletions
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index c774793b2221..10e3bdabbcda 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -60,9 +60,6 @@ using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; extern ::rtl_StandardModuleCount g_moduleCount; @@ -348,7 +345,7 @@ static inline Reference< security::XAccessControlContext > getDynamicRestriction { if (xContext.is()) { - Any acc(xContext->getValueByName(rtl::OUString(s_acRestriction))); + Any acc(xContext->getValueByName(OUString(s_acRestriction))); if (typelib_TypeClass_INTERFACE == acc.pType->eTypeClass) { // avoid ref-counting @@ -409,7 +406,7 @@ class AccessController bool m_defaultPerm_init; bool m_singleUser_init; // for multi-user mode - lru_cache< OUString, PermissionCollection, ::rtl::OUStringHash, equal_to< OUString > > + lru_cache< OUString, PermissionCollection, OUStringHash, equal_to< OUString > > m_user2permissions; ThreadData m_rec; @@ -606,13 +603,13 @@ static void dumpPermissions( buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> dumping default permissions:") ); } - OString str( ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); Sequence< OUString > permissions( collection.toStrings() ); OUString const * p = permissions.getConstArray(); for ( sal_Int32 nPos = 0; nPos < permissions.getLength(); ++nPos ) { - OString str( ::rtl::OUStringToOString( p[ nPos ], RTL_TEXTENCODING_ASCII_US ) ); + OString str( OUStringToOString( p[ nPos ], RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); } OSL_TRACE( "> permission dump done" ); @@ -754,7 +751,7 @@ PermissionCollection AccessController::getEffectivePermissions( buf.append( userId ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\"") ); OString str( - ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); + OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); #endif return PermissionCollection( new AllPermission() ); diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h index bb0fcba130db..be081b761074 100644 --- a/stoc/source/security/lru_cache.h +++ b/stoc/source/security/lru_cache.h @@ -188,11 +188,11 @@ inline t_val const * lru_cache< t_key, t_val, t_hashKey, t_equalKey >::lookup( Entry * entry = iFind->second; toFront( entry ); #ifdef __CACHE_DIAGNOSE - ::rtl::OUStringBuffer buf( 48 ); + OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> retrieved element \"") ); buf.append( entry->m_key ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") ); - ::rtl::OString str( ::rtl::OUStringToOString( + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); #endif @@ -217,11 +217,11 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set( #ifdef __CACHE_DIAGNOSE if (entry->m_key.getLength()) { - ::rtl::OUStringBuffer buf( 48 ); + OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> kicking element \"") ); buf.append( entry->m_key ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" from cache") ); - ::rtl::OString str( ::rtl::OUStringToOString( + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); } @@ -239,11 +239,11 @@ inline void lru_cache< t_key, t_val, t_hashKey, t_equalKey >::set( { entry = iFind->second; #ifdef __CACHE_DIAGNOSE - ::rtl::OUStringBuffer buf( 48 ); + OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("> replacing element \"") ); buf.append( entry->m_key ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("\" in cache") ); - ::rtl::OString str( ::rtl::OUStringToOString( + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); #endif diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index c6edcf2004db..4cf385e9361a 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -40,8 +40,6 @@ using namespace ::std; using namespace ::osl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; namespace stoc_sec { @@ -74,7 +72,7 @@ static inline sal_Int32 makeMask( OUStringBuffer buf( 48 ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("### ignoring unknown socket action: ") ); buf.append( item ); - ::rtl::OString str( ::rtl::OUStringToOString( + OString str( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); } @@ -565,8 +563,8 @@ static void demanded_diag( buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("demanding ") ); buf.append( perm.toString() ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" => ok.") ); - ::rtl::OString str( - ::rtl::OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); + OString str( + OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US ) ); OSL_TRACE( "%s", str.getStr() ); } #endif diff --git a/stoc/source/security/permissions.h b/stoc/source/security/permissions.h index 05c6b9e61a92..39532990a220 100644 --- a/stoc/source/security/permissions.h +++ b/stoc/source/security/permissions.h @@ -49,7 +49,7 @@ public: {} virtual bool implies( Permission const & perm ) const SAL_THROW(()) = 0; - virtual ::rtl::OUString toString() const SAL_THROW(()) = 0; + virtual OUString toString() const SAL_THROW(()) = 0; }; //================================================================================================== class AllPermission : public Permission @@ -62,7 +62,7 @@ public: {} virtual bool implies( Permission const & ) const SAL_THROW(()); - virtual ::rtl::OUString toString() const SAL_THROW(()); + virtual OUString toString() const SAL_THROW(()); }; //================================================================================================== @@ -83,7 +83,7 @@ public: PermissionCollection const & addition = PermissionCollection() ) SAL_THROW( (::com::sun::star::uno::RuntimeException) ); #ifdef __DIAGNOSE - ::com::sun::star::uno::Sequence< ::rtl::OUString > toStrings() const SAL_THROW(()); + ::com::sun::star::uno::Sequence< OUString > toStrings() const SAL_THROW(()); #endif void checkPermission( ::com::sun::star::uno::Any const & perm ) const SAL_THROW( (::com::sun::star::uno::RuntimeException) ); |