diff options
author | Tor Lillqvist <tml@collabora.com> | 2017-02-15 23:55:18 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2017-02-15 23:01:23 +0000 |
commit | 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4 (patch) | |
tree | 3f669db44367a2a072b899a1a1b87eb25ee607af /comphelper | |
parent | 3e1e49561bb734475d2b7d1db1beef0d3e9b53cd (diff) |
Drop :: prefix from std in c*/
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155
Reviewed-on: https://gerrit.libreoffice.org/34324
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'comphelper')
22 files changed, 102 insertions, 102 deletions
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index c05d143729de..ea8459596957 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -389,7 +389,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde aObjDescr[1].Name = "DefaultParentBaseURL"; aObjDescr[1].Value <<= *pBaseURL; } - ::std::copy( rArgs.begin(), rArgs.end(), aObjDescr.getArray() + nExtraArgs ); + std::copy( rArgs.begin(), rArgs.end(), aObjDescr.getArray() + nExtraArgs ); xObj.set( xFactory->createInstanceInitNew( rClassId, OUString(), pImpl->mxStorage, rNewName, aObjDescr ), uno::UNO_QUERY ); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index fcd42c341912..530d799cec5f 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -82,15 +82,15 @@ namespace comphelper class MapEnumerator; - typedef ::std::map< Any, Any, LessPredicateAdapter > KeyedValues; + typedef std::map< Any, Any, LessPredicateAdapter > KeyedValues; struct MapData { Type m_aKeyType; Type m_aValueType; - ::std::unique_ptr< KeyedValues > m_pValues; - ::std::shared_ptr< IKeyPredicateLess > m_pKeyCompare; + std::unique_ptr< KeyedValues > m_pValues; + std::shared_ptr< IKeyPredicateLess > m_pKeyCompare; bool m_bMutable; - ::std::vector< MapEnumerator* > m_aModListeners; + std::vector< MapEnumerator* > m_aModListeners; MapData() :m_bMutable( true ) @@ -125,7 +125,7 @@ namespace comphelper static void lcl_revokeMapModificationListener( MapData& _mapData, MapEnumerator& _listener ) { - for ( ::std::vector< MapEnumerator* >::iterator lookup = _mapData.m_aModListeners.begin(); + for ( std::vector< MapEnumerator* >::iterator lookup = _mapData.m_aModListeners.begin(); lookup != _mapData.m_aModListeners.end(); ++lookup ) @@ -297,7 +297,7 @@ namespace comphelper private: // since we share our mutex with the main map, we need to keep it alive as long as we live Reference< XInterface > m_xKeepMapAlive; - ::std::unique_ptr< MapData > m_pMapDataCopy; + std::unique_ptr< MapData > m_pMapDataCopy; MapEnumerator m_aEnumerator; }; @@ -349,7 +349,7 @@ namespace comphelper throw IllegalTypeException("Unsupported value type.", *this ); // create the comparator for the KeyType, and throw if the type is not supported - ::std::unique_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, nullptr ) ); + std::unique_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, nullptr ) ); if ( !pComparator.get() ) throw IllegalTypeException("Unsupported key type.", *this ); diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index faf6915f3323..46be1454c8ef 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -75,8 +75,8 @@ struct AttachedObject_Impl struct AttacherIndex_Impl { - ::std::deque< ScriptEventDescriptor > aEventList; - ::std::deque< AttachedObject_Impl > aObjList; + std::deque< ScriptEventDescriptor > aEventList; + std::deque< AttachedObject_Impl > aObjList; }; @@ -84,7 +84,7 @@ class ImplEventAttacherManager : public WeakImplHelper< XEventAttacherManager, XPersistObject > { friend class AttacherAllListener_Impl; - ::std::deque< AttacherIndex_Impl > aIndex; + std::deque< AttacherIndex_Impl > aIndex; Mutex aLock; // Container for the ScriptListener OInterfaceContainerHelper2 aScriptListeners; @@ -126,7 +126,7 @@ private: @return the iterator pointing to the position indicated by the index */ - ::std::deque<AttacherIndex_Impl>::iterator implCheckIndex( sal_Int32 _nIndex ); + std::deque<AttacherIndex_Impl>::iterator implCheckIndex( sal_Int32 _nIndex ); }; @@ -376,12 +376,12 @@ Reference< XIdlReflection > ImplEventAttacherManager::getReflection() } -::std::deque< AttacherIndex_Impl >::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex ) +std::deque< AttacherIndex_Impl >::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex ) { if ( (_nIndex < 0) || (static_cast<sal_uInt32>(_nIndex) >= aIndex.size()) ) throw IllegalArgumentException(); - ::std::deque<AttacherIndex_Impl>::iterator aIt = aIndex.begin() + _nIndex; + std::deque<AttacherIndex_Impl>::iterator aIt = aIndex.begin() + _nIndex; return aIt; } @@ -395,9 +395,9 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent Guard< Mutex > aGuard( aLock ); // Examine the index and apply the array - ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); + std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); - ::std::deque< AttachedObject_Impl > aList = (*aIt).aObjList; + std::deque< AttachedObject_Impl > aList = (*aIt).aObjList; ScriptEventDescriptor aEvt = ScriptEvent; sal_Int32 nLastDot = aEvt.ListenerType.lastIndexOf('.'); @@ -432,7 +432,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents Guard< Mutex > aGuard( aLock ); // Examine the index and apply the array - ::std::deque< AttachedObject_Impl > aList = implCheckIndex( nIndex )->aObjList; + std::deque< AttachedObject_Impl > aList = implCheckIndex( nIndex )->aObjList; for( const auto& rObj : aList ) this->detach( nIndex, rObj.xTarget ); @@ -456,9 +456,9 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent { Guard< Mutex > aGuard( aLock ); - ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); + std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); - ::std::deque< AttachedObject_Impl > aList = aIt->aObjList; + std::deque< AttachedObject_Impl > aList = aIt->aObjList; for( const auto& rObj : aList ) this->detach( nIndex, rObj.xTarget ); @@ -467,7 +467,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent if (nLastDot != -1) aLstType = aLstType.copy(nLastDot+1); - ::std::deque< ScriptEventDescriptor >::const_iterator aEvtEnd = aIt->aEventList.end(); + std::deque< ScriptEventDescriptor >::const_iterator aEvtEnd = aIt->aEventList.end(); for( std::deque< ScriptEventDescriptor >::iterator aEvtIt = aIt->aEventList.begin(); aEvtIt != aEvtEnd; ++aEvtIt ) @@ -489,9 +489,9 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) { Guard< Mutex > aGuard( aLock ); - ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); + std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); - ::std::deque< AttachedObject_Impl > aList = aIt->aObjList; + std::deque< AttachedObject_Impl > aList = aIt->aObjList; for( const auto& rObj : aList ) this->detach( nIndex, rObj.xTarget ); aIt->aEventList.clear(); @@ -506,7 +506,7 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex) if( nIndex < 0 ) throw IllegalArgumentException(); - if ( static_cast< ::std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() ) + if ( static_cast< std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() ) aIndex.resize(nIndex+1); AttacherIndex_Impl aTmp; @@ -517,9 +517,9 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex) void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) { Guard< Mutex > aGuard( aLock ); - ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); + std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); - ::std::deque< AttachedObject_Impl > aList = aIt->aObjList; + std::deque< AttachedObject_Impl > aList = aIt->aObjList; for( const auto& rObj : aList ) this->detach( nIndex, rObj.xTarget ); @@ -530,7 +530,7 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEvents(sal_Int32 nIndex) { Guard< Mutex > aGuard( aLock ); - ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); + std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex ); return comphelper::containerToSequence(aIt->aEventList); } @@ -541,7 +541,7 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference if( nIndex < 0 || !xObject.is() ) throw IllegalArgumentException(); - if( static_cast< ::std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() ) + if( static_cast< std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() ) { // read older files if( nVersion == 1 ) @@ -554,7 +554,7 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference throw IllegalArgumentException(); } - ::std::deque< AttacherIndex_Impl >::iterator aCurrentPosition = aIndex.begin() + nIndex; + std::deque< AttacherIndex_Impl >::iterator aCurrentPosition = aIndex.begin() + nIndex; AttachedObject_Impl aTmp; aTmp.xTarget = xObject; @@ -600,12 +600,12 @@ void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference { Guard< Mutex > aGuard( aLock ); //return; - if( nIndex < 0 || static_cast< ::std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() || !xObject.is() ) + if( nIndex < 0 || static_cast< std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() || !xObject.is() ) throw IllegalArgumentException(); - ::std::deque< AttacherIndex_Impl >::iterator aCurrentPosition = aIndex.begin() + nIndex; - ::std::deque< AttachedObject_Impl >::iterator aObjEnd = aCurrentPosition->aObjList.end(); - for( ::std::deque< AttachedObject_Impl >::iterator aObjIt = aCurrentPosition->aObjList.begin(); + std::deque< AttacherIndex_Impl >::iterator aCurrentPosition = aIndex.begin() + nIndex; + std::deque< AttachedObject_Impl >::iterator aObjEnd = aCurrentPosition->aObjList.end(); + for( std::deque< AttachedObject_Impl >::iterator aObjIt = aCurrentPosition->aObjList.begin(); aObjIt != aObjEnd; ++aObjIt ) { diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index 742de12ff6cb..9eeeafc45b29 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -33,14 +33,14 @@ using namespace ::comphelper; namespace { - typedef ::std::pair< AccessibleEventNotifier::TClientId, + typedef std::pair< AccessibleEventNotifier::TClientId, AccessibleEventObject > ClientEvent; - typedef ::std::map< AccessibleEventNotifier::TClientId, + typedef std::map< AccessibleEventNotifier::TClientId, ::comphelper::OInterfaceContainerHelper2* > ClientMap; /// key is the end of the interval, value is the start of the interval - typedef ::std::map<AccessibleEventNotifier::TClientId, + typedef std::map<AccessibleEventNotifier::TClientId, AccessibleEventNotifier::TClientId> IntervalMap; struct lclMutex @@ -51,8 +51,8 @@ namespace : public rtl::StaticWithInit<IntervalMap, FreeIntervals> { IntervalMap operator() () { IntervalMap map; - map.insert(::std::make_pair( - ::std::numeric_limits<AccessibleEventNotifier::TClientId>::max(), 1)); + map.insert(std::make_pair( + std::numeric_limits<AccessibleEventNotifier::TClientId>::max(), 1)); return map; } }; @@ -73,12 +73,12 @@ namespace if (lower != rFreeIntervals.end() && lower->first == nId - 1) { // add nId by replacing lower with new merged entry - rFreeIntervals.insert(::std::make_pair(nId, lower->second)); + rFreeIntervals.insert(std::make_pair(nId, lower->second)); rFreeIntervals.erase(lower); } else // otherwise just add new 1-element interval { - rFreeIntervals.insert(::std::make_pair(nId, nId)); + rFreeIntervals.insert(std::make_pair(nId, nId)); } } // currently it's not checked whether intervals can be merged now diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 87a01f21282c..49d6d9326442 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -295,8 +295,8 @@ namespace comphelper if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); - sal_Int32 nMinIndex = ::std::min( nStartIndex, nEndIndex ); - sal_Int32 nMaxIndex = ::std::max( nStartIndex, nEndIndex ); + sal_Int32 nMinIndex = std::min( nStartIndex, nEndIndex ); + sal_Int32 nMaxIndex = std::max( nStartIndex, nEndIndex ); return sText.copy( nMinIndex, nMaxIndex - nMinIndex ); } diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx index 5704888a98ef..aa92b70f5309 100644 --- a/comphelper/source/misc/anycompare.cxx +++ b/comphelper/source/misc/anycompare.cxx @@ -158,9 +158,9 @@ namespace comphelper }; - ::std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator ) + std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator ) { - ::std::unique_ptr< IKeyPredicateLess > pComparator; + std::unique_ptr< IKeyPredicateLess > pComparator; switch ( i_type.getTypeClass() ) { case TypeClass_CHAR: diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index ba28772cd194..fe509536ff73 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -57,10 +57,10 @@ namespace comphelper }; - typedef ::std::deque< ProcessableEvent > EventQueue; + typedef std::deque< ProcessableEvent > EventQueue; - struct EqualProcessor : public ::std::unary_function< ProcessableEvent, bool > + struct EqualProcessor : public std::unary_function< ProcessableEvent, bool > { const ::rtl::Reference< IEventProcessor >& rProcessor; explicit EqualProcessor( const ::rtl::Reference< IEventProcessor >& _rProcessor ) :rProcessor( _rProcessor ) { } @@ -104,7 +104,7 @@ namespace comphelper ::osl::MutexGuard aGuard( m_xImpl->aMutex ); // remove all events for this processor - m_xImpl->aEvents.erase(::std::remove_if( m_xImpl->aEvents.begin(), m_xImpl->aEvents.end(), EqualProcessor( _xProcessor ) ), m_xImpl->aEvents.end()); + m_xImpl->aEvents.erase(std::remove_if( m_xImpl->aEvents.begin(), m_xImpl->aEvents.end(), EqualProcessor( _xProcessor ) ), m_xImpl->aEvents.end()); } diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index fff86ffff791..face14f70060 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/comphelper/source/misc/backupfilehelper.cxx @@ -554,7 +554,7 @@ namespace } }; - typedef ::std::vector< ExtensionInfoEntry > ExtensionInfoEntryVector; + typedef std::vector< ExtensionInfoEntry > ExtensionInfoEntryVector; class ExtensionInfo { @@ -1354,7 +1354,7 @@ namespace namespace { - typedef ::std::deque< PackedFileEntry > PackedFileEntryVector; + typedef std::deque< PackedFileEntry > PackedFileEntryVector; class PackedFile { @@ -1775,7 +1775,7 @@ namespace comphelper const sal_uInt16 nConfigNumCopies(static_cast<sal_uInt16>(sTokenOut.toUInt32())); // limit to range [1..mnMaxAllowedBackups] - mnNumBackups = ::std::min(::std::max(nConfigNumCopies, mnNumBackups), mnMaxAllowedBackups); + mnNumBackups = std::min(std::max(nConfigNumCopies, mnNumBackups), mnMaxAllowedBackups); } if (mbActive && rtl::Bootstrap::get("SecureUserConfigMode", sTokenOut)) @@ -1783,7 +1783,7 @@ namespace comphelper const sal_uInt16 nMode(static_cast<sal_uInt16>(sTokenOut.toUInt32())); // limit to range [0..2] - mnMode = ::std::min(nMode, sal_uInt16(2)); + mnMode = std::min(nMode, sal_uInt16(2)); } if (mbActive && rtl::Bootstrap::get("SecureUserConfigExtensions", sTokenOut)) diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index 3ff9e4a72639..7a66a771b030 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -33,7 +33,7 @@ namespace comphelper using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; - typedef ::std::vector< ComponentDescription > ComponentDescriptions; + typedef std::vector< ComponentDescription > ComponentDescriptions; /** implementation for <type>OModule</type>. not threadsafe, has to be guarded by its owner */ diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index 241899b9014e..7e8dbb52e24b 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -37,7 +37,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider( css::configuration::theDefaultProvider::get( rxContext ) ); - ::std::vector< css::uno::Any > lParams; + std::vector< css::uno::Any > lParams; css::beans::PropertyValue aParam ; // set root path diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 49fc0c3b5807..0ca3c01a55ab 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -268,7 +268,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( sal_uInt16 pPassData[16]; memset( pPassData, 0, sizeof(pPassData) ); - sal_Int32 nPassLen = ::std::min< sal_Int32 >( aPassword.getLength(), 15 ); + sal_Int32 nPassLen = std::min< sal_Int32 >( aPassword.getLength(), 15 ); memcpy( pPassData, aPassword.getStr(), nPassLen * sizeof(pPassData[0]) ); aResultKey = GenerateStd97Key( pPassData, aDocId ); @@ -350,7 +350,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( const Reference< XInteractionHandler >& rxInteractHandler, const OUString& rDocumentUrl, DocPasswordRequestType eRequestType, - const ::std::vector< OUString >* pDefaultPasswords, + const std::vector< OUString >* pDefaultPasswords, bool* pbIsDefaultPassword ) { css::uno::Sequence< css::beans::NamedValue > aEncData; @@ -361,7 +361,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( *pbIsDefaultPassword = false; if( pDefaultPasswords ) { - for( ::std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult::WrongPassword) && (aIt != aEnd); ++aIt ) + for( std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult::WrongPassword) && (aIt != aEnd); ++aIt ) { OSL_ENSURE( !aIt->isEmpty(), "DocPasswordHelper::requestAndVerifyDocPassword - unexpected empty default password" ); if( !aIt->isEmpty() ) diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index ff47011808a3..4e1471186d6e 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -155,9 +155,9 @@ namespace comphelper } - ::std::vector< OUString > NamedValueCollection::getNames() const + std::vector< OUString > NamedValueCollection::getNames() const { - ::std::vector< OUString > aNames; + std::vector< OUString > aNames; for ( NamedValueRepository::const_iterator it = m_pImpl->aValues.begin(), end = m_pImpl->aValues.end(); it != end; ++it ) { aNames.push_back( it->first ); @@ -314,7 +314,7 @@ namespace comphelper namespace { - struct Value2PropertyValue : public ::std::unary_function< NamedValueRepository::value_type, PropertyValue > + struct Value2PropertyValue : public std::unary_function< NamedValueRepository::value_type, PropertyValue > { PropertyValue operator()( const NamedValueRepository::value_type& _rValue ) { @@ -323,7 +323,7 @@ namespace comphelper } }; - struct Value2NamedValue : public ::std::unary_function< NamedValueRepository::value_type, NamedValue > + struct Value2NamedValue : public std::unary_function< NamedValueRepository::value_type, NamedValue > { NamedValue operator()( const NamedValueRepository::value_type& _rValue ) { @@ -336,7 +336,7 @@ namespace comphelper sal_Int32 NamedValueCollection::operator >>= ( Sequence< PropertyValue >& _out_rValues ) const { _out_rValues.realloc( m_pImpl->aValues.size() ); - ::std::transform( m_pImpl->aValues.begin(), m_pImpl->aValues.end(), _out_rValues.getArray(), Value2PropertyValue() ); + std::transform( m_pImpl->aValues.begin(), m_pImpl->aValues.end(), _out_rValues.getArray(), Value2PropertyValue() ); return _out_rValues.getLength(); } @@ -344,7 +344,7 @@ namespace comphelper sal_Int32 NamedValueCollection::operator >>= ( Sequence< NamedValue >& _out_rValues ) const { _out_rValues.realloc( m_pImpl->aValues.size() ); - ::std::transform( m_pImpl->aValues.begin(), m_pImpl->aValues.end(), _out_rValues.getArray(), Value2NamedValue() ); + std::transform( m_pImpl->aValues.begin(), m_pImpl->aValues.end(), _out_rValues.getArray(), Value2NamedValue() ); return _out_rValues.getLength(); } diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index 45afaa32e4ae..6ebfe0c11e39 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -182,7 +182,7 @@ OUString SAL_CALL NumberedCollection::getUntitledPrefix() ::sal_Int32 NumberedCollection::impl_searchFreeNumber () { // create ordered list of all possible numbers. - ::std::vector< ::sal_Int32 > lPossibleNumbers; + std::vector< ::sal_Int32 > lPossibleNumbers; ::sal_Int32 c = (::sal_Int32)m_lComponents.size (); ::sal_Int32 i = 1; @@ -212,7 +212,7 @@ OUString SAL_CALL NumberedCollection::getUntitledPrefix() continue; } - ::std::vector< ::sal_Int32 >::iterator pPossible = ::std::find(lPossibleNumbers.begin (), lPossibleNumbers.end (), rItem.nNumber); + std::vector< ::sal_Int32 >::iterator pPossible = std::find(lPossibleNumbers.begin (), lPossibleNumbers.end (), rItem.nNumber); if (pPossible != lPossibleNumbers.end ()) lPossibleNumbers.erase (pPossible); } diff --git a/comphelper/source/misc/simplefileaccessinteraction.cxx b/comphelper/source/misc/simplefileaccessinteraction.cxx index 5f59921ae7de..2d0cf5de5ca1 100644 --- a/comphelper/source/misc/simplefileaccessinteraction.cxx +++ b/comphelper/source/misc/simplefileaccessinteraction.cxx @@ -32,7 +32,7 @@ static const sal_Int32 HANDLE_AUTHENTICATIONREQUEST = 4; SimpleFileAccessInteraction::SimpleFileAccessInteraction( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) { - ::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions; + std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions; ::ucbhelper::InterceptedInteraction::InterceptedRequest aInterceptedRequest; //intercept standard IO error exception (local file and WebDAV) diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index f4fdf76c3ae5..a211229baad0 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.cxx @@ -40,7 +40,7 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference< , m_bHandledByInternalHandler(false) , m_xAuxiliaryHandler(xAuxiliaryHandler) { - ::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions; + std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions; ::ucbhelper::InterceptedInteraction::InterceptedRequest aInterceptedRequest; aInterceptedRequest.Handle = HANDLE_INTERACTIVEIOEXCEPTION; @@ -69,7 +69,7 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference< void StillReadWriteInteraction::resetInterceptions() { - setInterceptions(::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest >()); + setInterceptions(std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest >()); } void StillReadWriteInteraction::resetErrorStates() diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index c07e8c56b2c0..a2e4abdc7a14 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -86,10 +86,10 @@ namespace comphelper && (_rArguments[1] >>= AllowEmptyPropertyName) && (_rArguments[2] >>= AutomaticAddition)) { - ::std::copy( + std::copy( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), - ::std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() ) + std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() ) ); m_bAutoAddProperties = AutomaticAddition; @@ -97,10 +97,10 @@ namespace comphelper ::comphelper::NamedValueCollection aArguments( _rArguments ); if ( aArguments.get_ensureType( "AllowedTypes", aTypes ) ) - ::std::copy( + std::copy( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), - ::std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() ) + std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() ) ); aArguments.get_ensureType( "AutomaticAddition", m_bAutoAddProperties ); @@ -350,7 +350,7 @@ namespace comphelper namespace { - struct ComparePropertyValueByName : public ::std::binary_function< PropertyValue, PropertyValue, bool > + struct ComparePropertyValueByName : public std::binary_function< PropertyValue, PropertyValue, bool > { bool operator()( const PropertyValue& _rLHS, const PropertyValue& _rRHS ) { @@ -359,7 +359,7 @@ namespace comphelper }; template< typename CLASS > - struct TransformPropertyToName : public ::std::unary_function< CLASS, OUString > + struct TransformPropertyToName : public std::unary_function< CLASS, OUString > { const OUString& operator()( const CLASS& _rProp ) { @@ -367,7 +367,7 @@ namespace comphelper } }; - struct ExtractPropertyValue : public ::std::unary_function< PropertyValue, Any > + struct ExtractPropertyValue : public std::unary_function< PropertyValue, Any > { const Any& operator()( const PropertyValue& _rProp ) { @@ -387,7 +387,7 @@ namespace comphelper // their names Sequence< OUString > aNames( aProperties.getLength() ); - ::std::transform( + std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), aNames.getArray(), @@ -436,7 +436,7 @@ namespace comphelper { // sort (the XMultiPropertySet interface requires this) Sequence< PropertyValue > aProperties( _rProps ); - ::std::sort( + std::sort( aProperties.getArray(), aProperties.getArray() + aProperties.getLength(), ComparePropertyValueByName() @@ -444,7 +444,7 @@ namespace comphelper // a sequence of names Sequence< OUString > aNames( aProperties.getLength() ); - ::std::transform( + std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), aNames.getArray(), @@ -489,7 +489,7 @@ namespace comphelper // a sequence of values Sequence< Any > aValues( aProperties.getLength() ); - ::std::transform( + std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), aValues.getArray(), diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 678c457b563f..df08b946d349 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -44,7 +44,7 @@ namespace comphelper { - struct UnoTypeLess : public ::std::unary_function< css::uno::Type, bool > + struct UnoTypeLess : public std::unary_function< css::uno::Type, bool > { inline bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const { @@ -55,8 +55,8 @@ namespace comphelper } }; - typedef ::std::map< sal_Int32, css::uno::Any > MapInt2Any; - typedef ::std::set< css::uno::Type, UnoTypeLess > TypeBag; + typedef std::map< sal_Int32, css::uno::Any > MapInt2Any; + typedef std::set< css::uno::Type, UnoTypeLess > TypeBag; typedef ::cppu::WeakAggImplHelper5 < css::beans::XPropertyBag , css::util::XModifiable @@ -73,7 +73,7 @@ namespace comphelper { private: /// our IPropertyArrayHelper implementation - ::std::unique_ptr< ::cppu::OPropertyArrayHelper > + std::unique_ptr< ::cppu::OPropertyArrayHelper > m_pArrayHelper; ::comphelper::PropertyBag m_aDynamicProperties; diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 2a7dd2d52537..987fd2e1e323 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -51,7 +51,7 @@ namespace comphelper const Property* lcl_findPropertyByName( const std::vector< Property >& _rProps, const OUString& _rName ) { Property aNameProp(_rName, 0, Type(), 0); - auto pResult = ::std::lower_bound(_rProps.begin(), _rProps.end(), aNameProp, PropertyCompareByName()); + auto pResult = std::lower_bound(_rProps.begin(), _rProps.end(), aNameProp, PropertyCompareByName()); if ( pResult == _rProps.end() || pResult->Name != _rName ) return nullptr; @@ -67,15 +67,15 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( // merge and sort properties by name, delete duplicates (stable sort ensures delegator properties win) m_aProperties.insert( m_aProperties.end(), _rProperties.begin(), _rProperties.end() ); m_aProperties.insert( m_aProperties.end(), _rAggProperties.begin(), _rAggProperties.end() ); - ::std::stable_sort( m_aProperties.begin(), m_aProperties.end(), PropertyCompareByName() ); - m_aProperties.erase( ::std::unique(m_aProperties.begin(), m_aProperties.end(), + std::stable_sort( m_aProperties.begin(), m_aProperties.end(), PropertyCompareByName() ); + m_aProperties.erase( std::unique(m_aProperties.begin(), m_aProperties.end(), []( const css::beans::Property& x, const css::beans::Property& y ) -> bool { return x.Name == y.Name; } ), m_aProperties.end() ); m_aProperties.shrink_to_fit(); // fill aDelegatorProps with names from _rProperties for a fast existence check // different kinds of properties are processed differently - ::std::unordered_set< OUString, OUStringHash > aDelegatorProps; + std::unordered_set< OUString, OUStringHash > aDelegatorProps; aDelegatorProps.reserve( _rProperties.getLength() ); for( auto &delegateProp: _rProperties ) { @@ -84,7 +84,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( "OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper: duplicate delegatee property!" ); } - ::std::unordered_set< sal_Int32 > existingHandles; + std::unordered_set< sal_Int32 > existingHandles; existingHandles.reserve( m_aProperties.size() ); sal_Int32 nAggregateHandle = _nFirstAggregateId; for ( sal_Int32 nMPLoop = 0; nMPLoop < static_cast< sal_Int32 >( m_aProperties.size() ); ++nMPLoop ) @@ -237,7 +237,7 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles( for( sal_Int32 i = 0; i < nReqLen; ++i ) { aNameProp.Name = pReqProps[i]; - auto findIter = ::std::lower_bound(m_aProperties.begin(), m_aProperties.end(), aNameProp, PropertyCompareByName()); + auto findIter = std::lower_bound(m_aProperties.begin(), m_aProperties.end(), aNameProp, PropertyCompareByName()); if ( findIter != m_aProperties.end() ) { _pHandles[i] = findIter->Handle; @@ -253,7 +253,7 @@ namespace internal { private: OPropertySetAggregationHelper& m_rAggregationHelper; - ::std::set< sal_Int32 > m_aProperties; + std::set< sal_Int32 > m_aProperties; sal_Int32 m_nCurrentlyForwarding; public: diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index c89804d8bba2..a7533bc9f2bf 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -147,7 +147,7 @@ void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName) // binaere Suche const Property* pProperties = _rProps.getConstArray(); Property aNameProp(_rPropName, 0, Type(), 0); - const Property* pResult = ::std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName()); + const Property* pResult = std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName()); // gefunden ? if ( pResult && (pResult != pProperties + nLen) && (pResult->Name == _rPropName) ) @@ -165,7 +165,7 @@ void ModifyPropertyAttributes(Sequence<Property>& seqProps, const OUString& sPro // binaere Suche Property* pProperties = seqProps.getArray(); Property aNameProp(sPropName, 0, Type(), 0); - Property* pResult = ::std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName()); + Property* pResult = std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName()); // gefunden ? if ( pResult && (pResult != pProperties + nLen) && (pResult->Name == sPropName) ) diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx index 019c2b9d5723..b3be3ddbf5ac 100644 --- a/comphelper/source/property/propertybag.cxx +++ b/comphelper/source/property/propertybag.cxx @@ -46,7 +46,7 @@ namespace comphelper namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute; - typedef ::std::map< sal_Int32, Any > MapInt2Any; + typedef std::map< sal_Int32, Any > MapInt2Any; struct PropertyBag_Impl { PropertyBag_Impl() : m_bAllowEmptyPropertyName(false) { } diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index adaa6557a860..dcde4190d495 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::beans; namespace { // comparing two property descriptions - struct PropertyDescriptionHandleCompare : public ::std::binary_function< PropertyDescription, PropertyDescription, bool > + struct PropertyDescriptionHandleCompare : public std::binary_function< PropertyDescription, PropertyDescription, bool > { bool operator() (const PropertyDescription& x, const PropertyDescription& y) const { @@ -49,7 +49,7 @@ namespace } }; // comparing two property descriptions (by name) - struct PropertyDescriptionNameMatch : public ::std::unary_function< PropertyDescription, bool > + struct PropertyDescriptionNameMatch : public std::unary_function< PropertyDescription, bool > { OUString m_rCompare; explicit PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } @@ -154,7 +154,7 @@ bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) co // i.e. registered and revoked even though the XPropertySet has already been // accessed, a vector is not really the best data structure anymore ... - ConstPropertiesIterator pos = ::std::find_if( + ConstPropertiesIterator pos = std::find_if( m_aProperties.begin(), m_aProperties.end(), PropertyDescriptionNameMatch( _rName ) @@ -188,7 +188,7 @@ void OPropertyContainerHelper::implPushBackProperty(const PropertyDescription& _ } #endif - PropertiesIterator pos = ::std::lower_bound( + PropertiesIterator pos = std::lower_bound( m_aProperties.begin(), m_aProperties.end(), _rProp, ComparePropertyHandles() ); @@ -433,7 +433,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan PropertyDescription aHandlePropDesc; aHandlePropDesc.aProperty.Handle = _nHandle; // search a lower bound - PropertiesIterator aLowerBound = ::std::lower_bound( + PropertiesIterator aLowerBound = std::lower_bound( m_aProperties.begin(), m_aProperties.end(), aHandlePropDesc, @@ -449,7 +449,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan const Property& OPropertyContainerHelper::getProperty( const OUString& _rName ) const { - ConstPropertiesIterator pos = ::std::find_if( + ConstPropertiesIterator pos = std::find_if( m_aProperties.begin(), m_aProperties.end(), PropertyDescriptionNameMatch( _rName ) @@ -478,14 +478,14 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps) } // as our property vector is sorted by handles, not by name, we have to sort aOwnProps - ::std::sort(aOwnProps.getArray(), aOwnProps.getArray() + aOwnProps.getLength(), PropertyCompareByName()); + std::sort(aOwnProps.getArray(), aOwnProps.getArray() + aOwnProps.getLength(), PropertyCompareByName()); // unfortunately the STL merge function does not allow the output range to overlap one of the input ranges, // so we need an extra sequence Sequence< Property > aOutput; aOutput.realloc(_rProps.getLength() + aOwnProps.getLength()); // do the merge - ::std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1 + std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1 aOwnProps.getConstArray(), aOwnProps.getConstArray() + aOwnProps.getLength(), // input 2 aOutput.getArray(), // output PropertyCompareByName() // compare operator diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index 64daa2a14320..7ce9cf2d4752 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -50,7 +50,7 @@ struct AttributeList_Impl // performance improvement during adding vecAttribute.reserve(20); } - ::std::vector<struct TagAttribute_Impl> vecAttribute; + std::vector<struct TagAttribute_Impl> vecAttribute; }; sal_Int16 SAL_CALL AttributeList::getLength() @@ -78,7 +78,7 @@ OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) { - ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); + std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) { if( (*ii).sName == sName ) { @@ -90,7 +90,7 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) { - ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); + std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin(); for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) { if( (*ii).sName == sName ) { |