diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2021-10-06 21:26:07 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2021-10-07 14:27:00 +0200 |
commit | 5f91b3b6c6bf4935a5532330b0d834f6f50df32e (patch) | |
tree | 794e287771ac0b7bad774238e1272128898422fa /extensions | |
parent | e4a46880debff1c594a0495d8312fa5a93c77d0f (diff) |
drop 'using namespace std' in extensions(ole)
Change-Id: Id2bb87f792d389dd9e6eeddd17046a46cddfdb6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123192
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/source/ole/oleobjw.cxx | 9 | ||||
-rw-r--r-- | extensions/source/ole/olethread.cxx | 2 | ||||
-rw-r--r-- | extensions/source/ole/unoobjw.cxx | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx index 0cc08f94d535..ba33772c171a 100644 --- a/extensions/source/ole/oleobjw.cxx +++ b/extensions/source/ole/oleobjw.cxx @@ -47,7 +47,6 @@ #include "oleobjw.hxx" #include "unoobjw.hxx" #include <stdio.h> -using namespace std; using namespace osl; using namespace cppu; using namespace com::sun::star::script; @@ -2193,9 +2192,9 @@ void IUnknownWrapper::getFuncDesc(const OUString & sFuncName, FUNCDESC ** pFuncD // maybe this is a property, if so we need // to store either both id's ( put/get ) or // just the get. Storing both is more consistent - pair<cit, cit> pItems = m_mapComFunc.equal_range( sRealName ); + std::pair<cit, cit> pItems = m_mapComFunc.equal_range( sRealName ); for ( ;pItems.first != pItems.second; ++pItems.first ) - m_mapComFunc.insert( TLBFuncIndexMap::value_type ( make_pair(sFuncName, pItems.first->second ) )); + m_mapComFunc.insert( TLBFuncIndexMap::value_type ( std::make_pair(sFuncName, pItems.first->second ) )); itIndex = m_mapComFunc.find( sFuncName ); } @@ -2205,7 +2204,7 @@ void IUnknownWrapper::getFuncDesc(const OUString & sFuncName, FUNCDESC ** pFuncD #if OSL_DEBUG_LEVEL >= 1 // There must only be one entry if sFuncName represents a function or two // if it is a property - pair<cit, cit> p = m_mapComFunc.equal_range(sFuncName.toAsciiLowerCase()); + std::pair<cit, cit> p = m_mapComFunc.equal_range(sFuncName.toAsciiLowerCase()); int numEntries = 0; for ( ;p.first != p.second; p.first ++, numEntries ++); OSL_ASSERT( ! (numEntries > 3) ); @@ -2237,7 +2236,7 @@ void IUnknownWrapper::getPropDesc(const OUString & sFuncName, FUNCDESC ** pFuncD OSL_ASSERT( * pFuncDescGet == nullptr && * pFuncDescPut == nullptr); buildComTlbIndex(); typedef TLBFuncIndexMap::const_iterator cit; - pair<cit, cit> p = m_mapComFunc.equal_range(sFuncName); + std::pair<cit, cit> p = m_mapComFunc.equal_range(sFuncName); if (p.first == m_mapComFunc.end()) { //try case insensitive with IDispatch::GetIDsOfNames diff --git a/extensions/source/ole/olethread.cxx b/extensions/source/ole/olethread.cxx index 74d7346516c5..1580c0b7d44a 100644 --- a/extensions/source/ole/olethread.cxx +++ b/extensions/source/ole/olethread.cxx @@ -23,8 +23,6 @@ #include <osl/thread.hxx> #include <sal/log.hxx> -using namespace std; - void o2u_attachCurrentThread() { static osl::ThreadData oleThreadData; diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 21debd9f54cc..81fbae1a0aca 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -96,7 +96,6 @@ #include "unoobjw.hxx" #include "servprov.hxx" -using namespace std; using namespace osl; using namespace cppu; using namespace com::sun::star::uno; @@ -3095,7 +3094,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP UnoObjectWrapperRemoteOpt::GetIDsOfNames ( RE { // name has not been bad before( member exists typedef NameToIdMap::iterator ITnames; - pair< ITnames, bool > pair_id= m_nameToDispIdMap.emplace(name, m_currentId++); + std::pair< ITnames, bool > pair_id= m_nameToDispIdMap.emplace(name, m_currentId++); // new ID inserted ? if( pair_id.second ) {// yes, now create MemberInfo and ad to IdToMemberInfoMap |