From 013d9789c753d46f0a038e54db6e21f4d4922891 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Wed, 15 Feb 2017 22:31:33 +0200
Subject: Drop :: prefix from std in [a-b]*/
Change-Id: I0422aaf39bbce889c95ed9a81a0784cb03a1badd
Reviewed-on: https://gerrit.libreoffice.org/34320
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
---
basic/source/basmgr/basicmanagerrepository.cxx | 6 +++---
basic/source/basmgr/vbahelper.cxx | 4 ++--
basic/source/classes/sbxmod.cxx | 2 +-
basic/source/inc/expr.hxx | 4 ++--
basic/source/inc/parser.hxx | 2 +-
basic/source/inc/propacc.hxx | 2 +-
basic/source/inc/sbunoobj.hxx | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
(limited to 'basic')
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx
index 8a6032f84d21..a41feb1f4a86 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -63,9 +63,9 @@ namespace basic
using ::com::sun::star::lang::XComponent;
using ::com::sun::star::document::XEmbeddedScripts;
- typedef ::std::map< Reference< XInterface >, BasicManager*, ::comphelper::OInterfaceCompare< XInterface > > BasicManagerStore;
+ typedef std::map< Reference< XInterface >, BasicManager*, ::comphelper::OInterfaceCompare< XInterface > > BasicManagerStore;
- typedef ::std::vector< BasicManagerCreationListener* > CreationListeners;
+ typedef std::vector< BasicManagerCreationListener* > CreationListeners;
class ImplRepository : public ::utl::OEventListenerAdapter, public SfxListener
{
@@ -337,7 +337,7 @@ namespace basic
{
SolarMutexGuard g;
- CreationListeners::iterator pos = ::std::find( m_aCreationListeners.begin(), m_aCreationListeners.end(), &_rListener );
+ CreationListeners::iterator pos = std::find( m_aCreationListeners.begin(), m_aCreationListeners.end(), &_rListener );
if ( pos != m_aCreationListeners.end() )
m_aCreationListeners.erase( pos );
else {
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index 475a02fb4fce..32e0041f77e3 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -46,7 +46,7 @@ uno::Reference< frame::XModuleManager2 > lclCreateModuleManager()
return frame::ModuleManager::create(xContext);
}
-typedef ::std::vector<uno::Reference<frame::XModel>> ModelVector;
+typedef std::vector<uno::Reference<frame::XModel>> ModelVector;
ModelVector CreateDocumentsEnumeration(
const uno::Reference< frame::XModel >& rxModel)
@@ -144,7 +144,7 @@ void lclIterateDocuments( ModifyDocumentFunc pModifyDocumentFunc, const uno::Ref
struct CurrDirPool
{
::osl::Mutex maMutex;
- ::std::map< OUString, OUString > maCurrDirs;
+ std::map< OUString, OUString > maCurrDirs;
};
struct StaticCurrDirPool : public ::rtl::Static< CurrDirPool, StaticCurrDirPool > {};
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 8976a89be9cd..dd92692881da 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -84,7 +84,7 @@ using namespace com::sun::star::script;
using namespace com::sun::star::uno;
typedef ::cppu::WeakImplHelper< XInvocation > DocObjectWrapper_BASE;
-typedef ::std::map< sal_Int16, Any > OutParamMap;
+typedef std::map< sal_Int16, Any > OutParamMap;
class DocObjectWrapper : public DocObjectWrapper_BASE
{
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index a43f4544031f..c50489175ba3 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -35,8 +35,8 @@ class SbiSymDef;
class SbiProcDef;
-typedef ::std::unique_ptr<SbiExprList> SbiExprListPtr;
-typedef ::std::vector<SbiExprListPtr> SbiExprListVector;
+typedef std::unique_ptr<SbiExprList> SbiExprListPtr;
+typedef std::vector<SbiExprListPtr> SbiExprListVector;
struct SbVar {
SbiExprNode* pNext; // next element (for structures)
diff --git a/basic/source/inc/parser.hxx b/basic/source/inc/parser.hxx
index 9d2553f67b1b..e81ce3b50c29 100644
--- a/basic/source/inc/parser.hxx
+++ b/basic/source/inc/parser.hxx
@@ -26,7 +26,7 @@
#include <vector>
-typedef ::std::vector< OUString > StringVector;
+typedef std::vector< OUString > StringVector;
struct SbiParseStack;
diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx
index a3c79e6cdee8..e1fd4802ce12 100644
--- a/basic/source/inc/propacc.hxx
+++ b/basic/source/inc/propacc.hxx
@@ -28,7 +28,7 @@
#include <vector>
-typedef ::std::vector<css::beans::PropertyValue> SbPropertyValueArr_Impl;
+typedef std::vector<css::beans::PropertyValue> SbPropertyValueArr_Impl;
typedef ::cppu::WeakImplHelper< css::beans::XPropertySet,
css::beans::XPropertyAccess > SbPropertyValuesHelper;
diff --git a/basic/source/inc/sbunoobj.hxx b/basic/source/inc/sbunoobj.hxx
index 9ec617a7230a..3ee8f0478f1a 100644
--- a/basic/source/inc/sbunoobj.hxx
+++ b/basic/source/inc/sbunoobj.hxx
@@ -71,7 +71,7 @@ class SbUnoStructRefObject: public SbxObject
return rProp.toAsciiUpperCase().compareTo( rOtherProp.toAsciiUpperCase() ) < 0;
}
};
- typedef ::std::map< OUString, StructRefInfo*, caseLessComp > StructFieldInfo;
+ typedef std::map< OUString, StructRefInfo*, caseLessComp > StructFieldInfo;
StructFieldInfo maFields;
StructRefInfo maMemberInfo;
bool mbMemberCacheInit;
--
cgit