diff options
| author | Gabor Kelemen <gabor.kelemen.extern@allotropia.de> | 2023-02-14 23:34:19 +0100 |
|---|---|---|
| committer | Gabor Kelemen <kelemeng@ubuntu.com> | 2023-02-16 08:14:21 +0000 |
| commit | 79176694ddc7bce40ce2b82d3f332be8642a5167 (patch) | |
| tree | 7a2760db137310e6316f4917e3c845dbe6d8a9b7 /stoc/source | |
| parent | a38f13e364f9416a1a6d1163eba431eb1c6d5908 (diff) | |
Drop 'using namespace ::std' in dirs s*
Change-Id: If3119a1f2274aac0bf70576458e3adb4505a2a45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147076
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
Diffstat (limited to 'stoc/source')
| -rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 3 | ||||
| -rw-r--r-- | stoc/source/security/access_controller.cxx | 7 | ||||
| -rw-r--r-- | stoc/source/security/permissions.cxx | 3 |
3 files changed, 5 insertions, 8 deletions
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 894b00f42637..e79518cad1b9 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -45,7 +45,6 @@ #include <unordered_map> #include <vector> -using namespace ::std; using namespace ::osl; using namespace ::com::sun::star; using namespace css::uno; @@ -811,7 +810,7 @@ Reference< XInterface > FactoryImpl::createAdapter( &adapter_set, m_receiver2adapters, xKey.get(), rTypes ); if (nullptr == that) // again no entry { - pair< t_ptr_set::const_iterator, bool > i(adapter_set->insert(pNew)); + std::pair< t_ptr_set::const_iterator, bool > i(adapter_set->insert(pNew)); SAL_WARN_IF( !i.second, "stoc", "set already contains " << *(i.first) << " != " << pNew); diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index a62742692e5c..a99ea23b00e9 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -54,7 +54,6 @@ constexpr OUStringLiteral SERVICE_NAME = u"com.sun.star.security.AccessControlle constexpr OUStringLiteral USER_CREDS = u"access-control.user-credentials.id"; -using namespace ::std; using namespace ::osl; using namespace ::cppu; using namespace ::com::sun::star; @@ -296,11 +295,11 @@ class AccessController bool m_defaultPerm_init; bool m_singleUser_init; // for multi-user mode - lru_cache< OUString, PermissionCollection, OUStringHash, equal_to< OUString > > + lru_cache< OUString, PermissionCollection, OUStringHash, std::equal_to< OUString > > m_user2permissions; ThreadData m_rec; - typedef vector< pair< OUString, Any > > t_rec_vec; + typedef std::vector< std::pair< OUString, Any > > t_rec_vec; void clearPostPoned(); void checkAndClearPostPoned(); @@ -600,7 +599,7 @@ PermissionCollection AccessController::getEffectivePermissions( if (demanded_perm.hasValue()) { // enqueue - rec->push_back( pair< OUString, Any >( userId, demanded_perm ) ); + rec->push_back( std::pair< OUString, Any >( userId, demanded_perm ) ); } #ifdef __DIAGNOSE SAL_INFO("stoc", "> info: recurring call of user: " << userId ); diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx index 1799f9c8c2a5..12f39ce3d83a 100644 --- a/stoc/source/security/permissions.cxx +++ b/stoc/source/security/permissions.cxx @@ -38,7 +38,6 @@ #include "permissions.h" -using namespace ::std; using namespace ::osl; using namespace ::com::sun::star; using namespace css::uno; @@ -491,7 +490,7 @@ PermissionCollection::PermissionCollection( Sequence< OUString > PermissionCollection::toStrings() const { - vector< OUString > strings; + std::vector< OUString > strings; strings.reserve( 8 ); for ( Permission * perm = m_head.get(); perm; perm = perm->m_next.get() ) { |