diff options
Diffstat (limited to 'connectivity/source')
131 files changed, 455 insertions, 455 deletions
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index 2e8be47952bf..9cf55cb1a351 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -181,7 +181,7 @@ Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelImplementationId() namespace { - class TPropertyValueLessFunctor : public ::std::binary_function< css::beans::PropertyValue,css::beans::PropertyValue,bool> + class TPropertyValueLessFunctor : public std::binary_function< css::beans::PropertyValue,css::beans::PropertyValue,bool> { public: TPropertyValueLessFunctor() @@ -212,7 +212,7 @@ void OConnectionWrapper::createUniqueId( const OUString& _rURL // now we need to sort the properties PropertyValue* pBegin = _rInfo.getArray(); PropertyValue* pEnd = pBegin + _rInfo.getLength(); - ::std::sort(pBegin,pEnd,TPropertyValueLessFunctor()); + std::sort(pBegin,pEnd,TPropertyValueLessFunctor()); pBegin = _rInfo.getArray(); pEnd = pBegin + _rInfo.getLength(); diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index cada6eeb03e2..30ccbd971eed 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -129,7 +129,7 @@ typedef const sal_Char* StringIteratorT; struct ParserContext { - typedef ::std::stack< std::shared_ptr<ExpressionNode> > OperandStack; + typedef std::stack< std::shared_ptr<ExpressionNode> > OperandStack; // stores a stack of not-yet-evaluated operands. This is used // by the operators (i.e. '+', '*', 'sin' etc.) to pop their @@ -426,7 +426,7 @@ std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& _ ::boost::spirit::space_p ) ); #if (OSL_DEBUG_LEVEL > 0) - ::std::cout.flush(); // needed to keep stdout and cout in sync + std::cout.flush(); // needed to keep stdout and cout in sync #endif // input fully congested by the parser? diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index d8d426b1182d..92728dfc1406 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx @@ -114,7 +114,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) ,DataType::INTEGER ,DataType::INTEGER }; - ::std::vector<std::shared_ptr<ExpressionNode>> aConditions; + std::vector<std::shared_ptr<ExpressionNode>> aConditions; if ( aTypeInfoSettings.getLength() > 1 && ((aTypeInfoSettings.getLength() % 2) == 0) ) { const Any* pIter = aTypeInfoSettings.getConstArray(); @@ -145,8 +145,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) aRow.push_back(new ORowSetValueDecorator(aValue)); } - ::std::vector<std::shared_ptr<ExpressionNode>>::iterator aIter = aConditions.begin(); - ::std::vector<std::shared_ptr<ExpressionNode>>::const_iterator aEnd = aConditions.end(); + std::vector<std::shared_ptr<ExpressionNode>>::iterator aIter = aConditions.begin(); + std::vector<std::shared_ptr<ExpressionNode>>::const_iterator aEnd = aConditions.end(); for (; aIter != aEnd; ++aIter) { if ( (*aIter)->evaluate(aRow)->getValue().getBool() ) @@ -258,67 +258,67 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( ) OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( ) { - return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw)); + return callImplMethod(m_sIdentifierQuoteString,std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( ) { - return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw)); + return callImplMethod(m_isCatalogAtStart,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw)); } OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( ) { - return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw)); + return callImplMethod(m_sCatalogSeparator,std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( ) { - return callImplMethod(m_supportsCatalogsInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw)); + return callImplMethod(m_supportsCatalogsInTableDefinitions,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( ) { - return callImplMethod(m_supportsSchemasInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw)); + return callImplMethod(m_supportsSchemasInTableDefinitions,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( ) { - return callImplMethod(m_supportsCatalogsInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw)); + return callImplMethod(m_supportsCatalogsInDataManipulation,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( ) { - return callImplMethod(m_supportsSchemasInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw)); + return callImplMethod(m_supportsSchemasInDataManipulation,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( ) { - return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw)); + return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( ) { - return callImplMethod(m_supportsAlterTableWithAddColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw)); + return callImplMethod(m_supportsAlterTableWithAddColumn,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( ) { - return callImplMethod(m_supportsAlterTableWithDropColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw)); + return callImplMethod(m_supportsAlterTableWithDropColumn,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw)); } sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( ) { - return callImplMethod(m_MaxStatements,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw)); + return callImplMethod(m_MaxStatements,std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw)); } sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( ) { - return callImplMethod(m_MaxTablesInSelect,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw)); + return callImplMethod(m_MaxTablesInSelect,std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw)); } sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( ) { - return callImplMethod(m_storesMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw)); + return callImplMethod(m_storesMixedCaseQuotedIdentifiers,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw)); } diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx index 0adbc7031a48..28c1827075eb 100644 --- a/connectivity/source/commontools/TIndex.cxx +++ b/connectivity/source/commontools/TIndex.cxx @@ -36,7 +36,7 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex , m_pTable(_pTable) { construct(); - ::std::vector< OUString> aVector; + std::vector< OUString> aVector; m_pColumns.reset( new OIndexColumns(this,m_aMutex,aVector) ); } @@ -63,7 +63,7 @@ void OIndexHelper::refreshColumns() if ( !m_pTable ) return; - ::std::vector< OUString> aVector; + std::vector< OUString> aVector; if ( !isNew() ) { ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap(); diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index 3d19c026ec1d..fcddb7f4caec 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::lang; OIndexColumns::OIndexColumns( OIndexHelper* _pIndex, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector) + const std::vector< OUString> &_rVector) : connectivity::sdbcx::OCollection(*_pIndex,true,_rMutex,_rVector) ,m_pIndex(_pIndex) { diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 66a7ccb6078d..0c950b919e24 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -40,7 +40,7 @@ using namespace cppu; OIndexesHelper::OIndexesHelper(OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector + const std::vector< OUString> &_rVector ) : OCollection(*_pTable,true,_rMutex,_rVector) ,m_pTable(_pTable) diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx index 783aa533ad92..89d5bf44b3f1 100644 --- a/connectivity/source/commontools/TKey.cxx +++ b/connectivity/source/commontools/TKey.cxx @@ -52,7 +52,7 @@ void OTableKeyHelper::refreshColumns() if ( !m_pTable ) return; - ::std::vector< OUString> aVector; + std::vector< OUString> aVector; if ( !isNew() ) { aVector = m_aProps->m_aKeyColumnNames; diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index 01cdab458112..5e6dca1c3f5d 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang; OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector) + const std::vector< OUString> &_rVector) : connectivity::sdbcx::OCollection(*_pKey,true,_rMutex,_rVector) ,m_pKey(_pKey) { diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx index 829dfd1beb8e..5778e219d121 100644 --- a/connectivity/source/commontools/TSkipDeletedSet.cxx +++ b/connectivity/source/commontools/TSkipDeletedSet.cxx @@ -151,7 +151,7 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, s if ( nDriverPos > (sal_Int32)m_aBookmarksPositions.size() ) m_aBookmarksPositions.push_back(nDriverPos); } - else if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() ) + else if ( std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() ) m_aBookmarksPositions.push_back(nDriverPos); /*sal_Int32 nDriverPos = m_pHelper->getDriverPos(); if(m_aBookmarks.find(nDriverPos) == m_aBookmarks.end()) @@ -225,13 +225,13 @@ bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool _bRetrieveData) void OSkipDeletedSet::clear() { - ::std::vector<sal_Int32>().swap(m_aBookmarksPositions); + std::vector<sal_Int32>().swap(m_aBookmarksPositions); //TInt2IntMap().swap(m_aBookmarks); } sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const { - ::std::vector<sal_Int32>::const_iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos); + std::vector<sal_Int32>::const_iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos); if ( aFind != m_aBookmarksPositions.end() ) return (aFind - m_aBookmarksPositions.begin()) + 1; /*TInt2IntMap::const_iterator aFind = m_aBookmarks.find(_nPos); @@ -245,13 +245,13 @@ void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos) { //OSL_ENSURE(m_aBookmarks.find(_nPos) == m_aBookmarks.end(),"OSkipDeletedSet::insertNewPosition: Invalid position"); //m_aBookmarksPositions.push_back(m_aBookmarks.insert(TInt2IntMap::value_type(_nPos,m_aBookmarksPositions.size()+1)).first); - //OSL_ENSURE(::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos"); + //OSL_ENSURE(std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos"); m_aBookmarksPositions.push_back(_nPos); } void OSkipDeletedSet::deletePosition(sal_Int32 _nBookmark) { - ::std::vector<sal_Int32>::iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark); + std::vector<sal_Int32>::iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark); if ( aFind != m_aBookmarksPositions.end() ) { //TInt2IntMap::iterator aFind = m_aBookmarks.find(_nPos); diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 2bb5541d0d6d..d1c72e01a921 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -25,7 +25,7 @@ using namespace connectivity; /// binary_function Functor object for class OSortIndex::TIntValuePairVector::value_type returntype is bool -struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::value_type,OSortIndex::TIntValuePairVector::value_type,bool> +struct TKeyValueFunc : std::binary_function<OSortIndex::TIntValuePairVector::value_type,OSortIndex::TIntValuePairVector::value_type,bool> { OSortIndex* pIndex; @@ -35,9 +35,9 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v // return false if compared values are equal otherwise true inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const { - const ::std::vector<OKeyType>& aKeyType = pIndex->getKeyType(); - ::std::vector<OKeyType>::const_iterator aIter = aKeyType.begin(); - for (::std::vector<sal_Int16>::size_type i=0;aIter != aKeyType.end(); ++aIter,++i) + const std::vector<OKeyType>& aKeyType = pIndex->getKeyType(); + std::vector<OKeyType>::const_iterator aIter = aKeyType.begin(); + for (std::vector<sal_Int16>::size_type i=0;aIter != aKeyType.end(); ++aIter,++i) { const bool bGreater = pIndex->getAscending(i) != TAscendingOrder::ASC; const bool bLess = !bGreater; @@ -82,16 +82,16 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v ::rtl::Reference<OKeySet> pKeySet = new OKeySet(); pKeySet->get().reserve(m_aKeyValues.size()); - ::std::transform(m_aKeyValues.begin() + std::transform(m_aKeyValues.begin() ,m_aKeyValues.end() - ,::std::back_inserter(pKeySet->get()) + ,std::back_inserter(pKeySet->get()) ,::o3tl::select1st<TIntValuePairVector::value_type>()); pKeySet->setFrozen(); return pKeySet; } -OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType, - const ::std::vector<TAscendingOrder>& _aAscending) +OSortIndex::OSortIndex( const std::vector<OKeyType>& _aKeyType, + const std::vector<TAscendingOrder>& _aAscending) :m_aKeyType(_aKeyType) ,m_aAscending(_aAscending) ,m_bFrozen(false) @@ -120,7 +120,7 @@ void OSortIndex::Freeze() // Sortierung: if (m_aKeyType[0] != OKeyType::NONE) // we will sort ourself when the first keyType say so - ::std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this)); + std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this)); TIntValuePairVector::iterator aIter = m_aKeyValues.begin(); for(;aIter != m_aKeyValues.end();++aIter) diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 7d20c75e7573..3f851a6afd1f 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -57,7 +57,7 @@ class OTableContainerListener: public ::cppu::WeakImplHelper< XContainerListener > { OTableHelper* m_pComponent; - ::std::map< OUString,bool> m_aRefNames; + std::map< OUString,bool> m_aRefNames; protected: virtual ~OTableContainerListener() override {} @@ -89,7 +89,7 @@ public: { } void clear() { m_pComponent = nullptr; } - inline void add(const OUString& _sRefName) { m_aRefNames.insert(::std::map< OUString,bool>::value_type(_sRefName,true)); } + inline void add(const OUString& _sRefName) { m_aRefNames.insert(std::map< OUString,bool>::value_type(_sRefName,true)); } }; } namespace connectivity @@ -116,7 +116,7 @@ namespace connectivity Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; Reference< css::sdbc::XConnection > m_xConnection; rtl::Reference<OTableContainerListener> m_xTablePropertyListener; - ::std::vector< ColumnDesc > m_aColumnDesc; + std::vector< ColumnDesc > m_aColumnDesc; explicit OTableHelperImpl(const Reference< css::sdbc::XConnection >& _xConnection) : m_xConnection(_xConnection) { @@ -191,7 +191,7 @@ namespace { /** collects ColumnDesc's from a resultset produced by XDatabaseMetaData::getColumns */ - void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, ::std::vector< ColumnDesc >& _out_rColumns ) + void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, std::vector< ColumnDesc >& _out_rColumns ) { Reference< XRow > xRow( _rxResult, UNO_QUERY_THROW ); OUString sName; @@ -214,14 +214,14 @@ namespace /** checks a given array of ColumnDesc's whether it has reasonable ordinal positions. If not, they will be normalized to be the array index. */ - void lcl_sanitizeColumnDescs( ::std::vector< ColumnDesc >& _rColumns ) + void lcl_sanitizeColumnDescs( std::vector< ColumnDesc >& _rColumns ) { if ( _rColumns.empty() ) return; // collect all used ordinals - ::std::set< OrdinalPosition > aUsedOrdinals; - for ( ::std::vector< ColumnDesc >::const_iterator collect = _rColumns.begin(); + std::set< OrdinalPosition > aUsedOrdinals; + for ( std::vector< ColumnDesc >::const_iterator collect = _rColumns.begin(); collect != _rColumns.end(); ++collect ) @@ -239,7 +239,7 @@ namespace OSL_FAIL( "lcl_sanitizeColumnDescs: database did provide invalid ORDINAL_POSITION values!" ); OrdinalPosition nNormalizedPosition = 1; - for ( ::std::vector< ColumnDesc >::iterator normalize = _rColumns.begin(); + for ( std::vector< ColumnDesc >::iterator normalize = _rColumns.begin(); normalize != _rColumns.end(); ++normalize ) @@ -250,7 +250,7 @@ namespace // what's left is that the range might not be from 1 to <column count>, but for instance // 0 to <column count>-1. size_t nOffset = *aUsedOrdinals.begin() - 1; - for ( ::std::vector< ColumnDesc >::iterator offset = _rColumns.begin(); + for ( std::vector< ColumnDesc >::iterator offset = _rColumns.begin(); offset != _rColumns.end(); ++offset ) @@ -283,19 +283,19 @@ void OTableHelper::refreshColumns() lcl_sanitizeColumnDescs( m_pImpl->m_aColumnDesc ); // sort by ordinal position - ::std::map< OrdinalPosition, OUString > aSortedColumns; - for ( ::std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin(); + std::map< OrdinalPosition, OUString > aSortedColumns; + for ( std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin(); copy != m_pImpl->m_aColumnDesc.end(); ++copy ) aSortedColumns[ copy->nOrdinalPosition ] = copy->sName; // copy them to aVector, now that we have the proper ordering - ::std::transform( + std::transform( aSortedColumns.begin(), aSortedColumns.end(), - ::std::insert_iterator< TStringVector >( aVector, aVector.begin() ), - ::o3tl::select2nd< ::std::map< OrdinalPosition, OUString >::value_type >() + std::insert_iterator< TStringVector >( aVector, aVector.begin() ), + ::o3tl::select2nd< std::map< OrdinalPosition, OUString >::value_type >() ); } @@ -308,15 +308,15 @@ void OTableHelper::refreshColumns() const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) const { const ColumnDesc* pRet = nullptr; - ::std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end(); - for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter) + std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end(); + for (std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter) { if ( aIter->sName == _sName ) { pRet = &*aIter; break; } - } // for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter) + } // for (std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter) return pRet; } diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index dc3440f66b9d..f883b576ee4d 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -965,7 +965,7 @@ try if ( pOldProps[i].Name != "DefaultControl" && pOldProps[i].Name != "LabelControl" ) { // binary search - Property* pResult = ::std::lower_bound( + Property* pResult = std::lower_bound( pNewProps, pNewProps + nNewLen, pOldProps[i], ::comphelper::PropertyCompareByName()); if ( pResult @@ -1383,11 +1383,11 @@ sal_Int32 getSearchColumnFlag( const Reference< XConnection>& _rxConn,sal_Int32 OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& _rBaseName, bool _bStartWithNumber ) { - ::std::set< OUString > aUsedNames; - ::std::copy( + std::set< OUString > aUsedNames; + std::copy( _rNames.getConstArray(), _rNames.getConstArray() + _rNames.getLength(), - ::std::insert_iterator< ::std::set< OUString > >( aUsedNames, aUsedNames.end() ) + std::insert_iterator< std::set< OUString > >( aUsedNames, aUsedNames.end() ) ); OUString sName( _rBaseName ); @@ -1630,10 +1630,10 @@ namespace { class OParameterWrapper : public ::cppu::WeakImplHelper< XIndexAccess > { - ::std::vector<bool, std::allocator<bool> > m_aSet; + std::vector<bool, std::allocator<bool> > m_aSet; Reference<XIndexAccess> m_xSource; public: - OParameterWrapper(const ::std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){} + OParameterWrapper(const std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){} private: // css::container::XElementAccess virtual Type SAL_CALL getElementType() override @@ -1644,14 +1644,14 @@ namespace { if ( m_aSet.empty() ) return m_xSource->hasElements(); - return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0; + return std::count(m_aSet.begin(),m_aSet.end(),false) != 0; } // css::container::XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) override { if ( m_aSet.empty() ) return m_xSource->getCount(); - return ::std::count(m_aSet.begin(),m_aSet.end(),false); + return std::count(m_aSet.begin(),m_aSet.end(),false); } virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override { @@ -1660,8 +1660,8 @@ namespace if ( m_aSet.size() < (size_t)Index ) throw IndexOutOfBoundsException(); - ::std::vector<bool, std::allocator<bool> >::const_iterator aIter = m_aSet.begin(); - ::std::vector<bool, std::allocator<bool> >::const_iterator aEnd = m_aSet.end(); + std::vector<bool, std::allocator<bool> >::const_iterator aIter = m_aSet.begin(); + std::vector<bool, std::allocator<bool> >::const_iterator aEnd = m_aSet.end(); sal_Int32 i = 0; sal_Int32 nParamPos = -1; for(; aIter != aEnd && i <= Index; ++aIter) @@ -1681,7 +1681,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, const Reference<XParameters>& _xParameters, const Reference< XConnection>& _xConnection, const Reference< XInteractionHandler >& _rxHandler, - const ::std::vector<bool, std::allocator<bool> >& _aParametersSet) + const std::vector<bool, std::allocator<bool> >& _aParametersSet) { OSL_ENSURE(_xComposer.is(),"dbtools::askForParameters XSQLQueryComposer is null!"); OSL_ENSURE(_xParameters.is(),"dbtools::askForParameters XParameters is null!"); @@ -1693,12 +1693,12 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, Reference<XIndexAccess> xParamsAsIndicies = xParameters.is() ? xParameters->getParameters() : Reference<XIndexAccess>(); sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0; - ::std::vector<bool, std::allocator<bool> > aNewParameterSet( _aParametersSet ); - if ( nParamCount && ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount ) + std::vector<bool, std::allocator<bool> > aNewParameterSet( _aParametersSet ); + if ( nParamCount && std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount ) { static const OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)); aNewParameterSet.resize(nParamCount ,false); - typedef ::std::map< OUString, ::std::vector<sal_Int32> > TParameterPositions; + typedef std::map< OUString, std::vector<sal_Int32> > TParameterPositions; TParameterPositions aParameterNames; for(sal_Int32 i = 0; i < nParamCount; ++i) { @@ -1758,8 +1758,8 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, xParamColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale; // (the index of the parameters is one-based) TParameterPositions::const_iterator aFind = aParameterNames.find(pFinalValues->Name); - ::std::vector<sal_Int32>::const_iterator aIterPos = aFind->second.begin(); - ::std::vector<sal_Int32>::const_iterator aEndPos = aFind->second.end(); + std::vector<sal_Int32>::const_iterator aIterPos = aFind->second.begin(); + std::vector<sal_Int32>::const_iterator aEndPos = aFind->second.end(); for(;aIterPos != aEndPos;++aIterPos) { if ( _aParametersSet.empty() || !_aParametersSet[(*aIterPos)-1] ) diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index ba73d0dddf03..43c0b424200e 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -638,9 +638,9 @@ bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp, const OUSt { Sequence< PropertyValue > aInfo; xProp->getPropertyValue("Info") >>= aInfo; - const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(), + const PropertyValue* pValue =std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), - ::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty)); + std::bind2nd(TPropertyValueEqualFunctor(),_sProperty)); if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) ) pValue->Value >>= bEnabled; } diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index ad3bf0338f15..2db8bb4e12a0 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -107,7 +107,7 @@ namespace dbtools m_sIdentifierQuoteString.clear(); m_sSpecialCharacters.clear(); m_xConnectionMetadata.clear(); - ::std::vector< bool > aEmptyArray; + std::vector< bool > aEmptyArray; m_aParametersVisited.swap( aEmptyArray ); m_bUpToDate = false; } @@ -240,7 +240,7 @@ namespace dbtools void ParameterManager::classifyLinks( const Reference< XNameAccess >& _rxParentColumns, - const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents ) + const Reference< XNameAccess >& _rxColumns, std::vector< OUString >& _out_rAdditionalFilterComponents ) { OSL_PRECOND( m_aMasterFields.size() == m_aDetailFields.size(), "ParameterManager::classifyLinks: master and detail fields should have the same length!" ); @@ -251,8 +251,8 @@ namespace dbtools // we may need to strip any links which are invalid, so here go the containers // for temporarirly holding the new pairs - ::std::vector< OUString > aStrippedMasterFields; - ::std::vector< OUString > aStrippedDetailFields; + std::vector< OUString > aStrippedMasterFields; + std::vector< OUString > aStrippedDetailFields; bool bNeedExchangeLinks = false; @@ -297,7 +297,7 @@ namespace dbtools OSL_PRECOND( !sNewParamName.isEmpty(), "ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned nonsense!" ); // remember meta information about this new parameter - ::std::pair< ParameterInformation::iterator, bool > aInsertionPos = + std::pair< ParameterInformation::iterator, bool > aInsertionPos = m_aParameterInformation.insert( ParameterInformation::value_type( sNewParamName, ParameterMetaData( nullptr ) ) ); @@ -376,7 +376,7 @@ namespace dbtools return; // classify the links - depending on what the detail fields in each link pair denotes - ::std::vector< OUString > aAdditionalFilterComponents; + std::vector< OUString > aAdditionalFilterComponents; classifyLinks( xParentColumns, xColumns, aAdditionalFilterComponents ); // did we find links where the detail field refers to a detail column (instead of a parameter name)? @@ -384,7 +384,7 @@ namespace dbtools { // build a conjunction of all the filter components OUStringBuffer sAdditionalFilter; - for ( ::std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin(); + for ( std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin(); aComponent != aAdditionalFilterComponents.end(); ++aComponent ) @@ -447,7 +447,7 @@ namespace dbtools // check which of the parameters have already been visited (e.g. filled via XParameters) size_t nAlreadyVisited = 0; - for ( ::std::vector< sal_Int32 >::iterator aIndex = aParam->second.aInnerIndexes.begin(); + for ( std::vector< sal_Int32 >::iterator aIndex = aParam->second.aInnerIndexes.begin(); aIndex != aParam->second.aInnerIndexes.end(); ++aIndex ) @@ -580,7 +580,7 @@ namespace dbtools Reference< XPropertySet > xMasterField(_rxParentColumns->getByName( *pMasterFields ),UNO_QUERY); // the positions where we have to fill in values for the current parameter name - for ( ::std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin(); + for ( std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin(); aPosition != aParamInfo->second.aInnerIndexes.end(); ++aPosition ) @@ -908,7 +908,7 @@ namespace dbtools if ( !xMasterField.is() ) continue; - for ( ::std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin(); + for ( std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin(); aPosition != aParamInfo->second.aInnerIndexes.end(); ++aPosition ) diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 1db52ce640c3..817de72d9365 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -76,7 +76,7 @@ namespace param ParameterWrapper::ParameterWrapper( const Reference< XPropertySet >& _rxColumn, - const Reference< XParameters >& _rxAllParameters, const ::std::vector< sal_Int32 >& _rIndexes ) + const Reference< XParameters >& _rxAllParameters, const std::vector< sal_Int32 >& _rIndexes ) :PropertyBase( m_aBHelper ) ,m_aIndexes( _rIndexes ) ,m_xDelegator( _rxColumn ) @@ -206,7 +206,7 @@ namespace param if ( m_xValueDestination.is() ) { - for ( ::std::vector< sal_Int32 >::const_iterator aIter = m_aIndexes.begin(); aIter != m_aIndexes.end(); ++aIter ) + for ( std::vector< sal_Int32 >::const_iterator aIter = m_aIndexes.begin(); aIter != m_aIndexes.end(); ++aIter ) { m_xValueDestination->setObjectWithInfo( *aIter + 1, rValue, nParamType, nScale ); // (the index of the parameters is one-based) diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx index b653d0f8eb4a..e88fb5098def 100644 --- a/connectivity/source/commontools/propertyids.cxx +++ b/connectivity/source/commontools/propertyids.cxx @@ -94,7 +94,7 @@ namespace dbtools const OUString& OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const { - ::std::map<sal_Int32, OUString>::const_iterator aIter = m_aPropertyMap.find(_nIndex); + std::map<sal_Int32, OUString>::const_iterator aIter = m_aPropertyMap.find(_nIndex); return aIter->second; } } diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index c261aeca4d24..9a6d5d657456 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -82,7 +82,7 @@ namespace connectivity private: ::osl::Mutex m_aMutex; Reference<XComponentContext> m_aContext; - ::std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources; + std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources; bool m_bAttemptedInit; }; @@ -177,7 +177,7 @@ namespace connectivity const Type& _rExceptionType, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) { if ( !::cppu::UnoType< SQLException >::get().isAssignableFrom( _rExceptionType ) ) - throw ::std::bad_cast(); + throw std::bad_cast(); // default-construct an exception of the desired type Any aException( nullptr, _rExceptionType ); diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index a350993bd0e0..0e6be4f36039 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -77,8 +77,8 @@ OConnectionPool::~OConnectionPool() clear(false); } -struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::value_type,void> - ,::std::unary_function<TActiveConnectionMap::value_type,void> +struct TRemoveEventListenerFunctor : std::unary_function<TPooledConnections::value_type,void> + ,std::unary_function<TActiveConnectionMap::value_type,void> { OConnectionPool* m_pConnectionPool; bool m_bDispose; @@ -113,7 +113,7 @@ struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::v } }; -struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type,void> +struct TConnectionPoolFunctor : std::unary_function<TConnectionMap::value_type,void> { OConnectionPool* m_pConnectionPool; @@ -124,7 +124,7 @@ struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type } void operator()(const TConnectionMap::value_type& _aValue) { - ::std::for_each(_aValue.second.aConnections.begin(),_aValue.second.aConnections.end(),TRemoveEventListenerFunctor(m_pConnectionPool,true)); + std::for_each(_aValue.second.aConnections.begin(),_aValue.second.aConnections.end(),TRemoveEventListenerFunctor(m_pConnectionPool,true)); } }; @@ -135,10 +135,10 @@ void OConnectionPool::clear(bool _bDispose) if(m_xInvalidator->isTicking()) m_xInvalidator->stop(); - ::std::for_each(m_aPool.begin(),m_aPool.end(),TConnectionPoolFunctor(this)); + std::for_each(m_aPool.begin(),m_aPool.end(),TConnectionPoolFunctor(this)); m_aPool.clear(); - ::std::for_each(m_aActiveConnections.begin(),m_aActiveConnections.end(),TRemoveEventListenerFunctor(this,_bDispose)); + std::for_each(m_aActiveConnections.begin(),m_aActiveConnections.end(),TRemoveEventListenerFunctor(this,_bDispose)); m_aActiveConnections.clear(); Reference< XComponent > xComponent(m_xDriverNode, UNO_QUERY); @@ -235,7 +235,7 @@ void OConnectionPool::invalidatePooledConnections() { if(!(--(aIter->second.nALiveCount))) // connections are invalid { - ::std::for_each(aIter->second.aConnections.begin(),aIter->second.aConnections.end(),TRemoveEventListenerFunctor(this,true)); + std::for_each(aIter->second.aConnections.begin(),aIter->second.aConnections.end(),TRemoveEventListenerFunctor(this,true)); aIter->second.aConnections.clear(); diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index 3430ee23c76c..890732848c90 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -62,7 +62,7 @@ namespace connectivity typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener> OConnectionPool_Base; // typedef for the internal structure - typedef ::std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections; + typedef std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections; // contains the currently pooled connections typedef struct @@ -83,7 +83,7 @@ namespace connectivity // typedef TDigestHolder - struct TDigestLess : public ::std::binary_function< TDigestHolder, TDigestHolder, bool> + struct TDigestLess : public std::binary_function< TDigestHolder, TDigestHolder, bool> { bool operator() (const TDigestHolder& x, const TDigestHolder& y) const { @@ -94,7 +94,7 @@ namespace connectivity } }; - typedef ::std::map< TDigestHolder,TConnectionPool,TDigestLess> TConnectionMap; + typedef std::map< TDigestHolder,TConnectionPool,TDigestLess> TConnectionMap; // contains additional information about a activeconnection which is needed to put it back to the pool typedef struct @@ -103,7 +103,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XPooledConnection> xPooledConnection; } TActiveConnectionInfo; - typedef ::std::map< css::uno::Reference< css::sdbc::XConnection>, + typedef std::map< css::uno::Reference< css::sdbc::XConnection>, TActiveConnectionInfo> TActiveConnectionMap; class OConnectionPool : public OConnectionPool_Base diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 1683f0d9dcfb..144a6f16b0b5 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -213,7 +213,7 @@ void OAdoColumn::fillPropertyValues() else if ( eType == adVarBinary && ADOS::isJetEngine(m_pConnection->getEngineType()) ) { ::comphelper::UStringMixEqual aCase(false); - OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), + OTypeInfoMap::const_iterator aFind = std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), [&aCase] (const OTypeInfoMap::value_type& typeInfo) { return aCase(typeInfo.second->getDBName(), OUString("VarBinary")); }); diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index b1395122343e..9f5e819f022f 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -86,7 +86,7 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPro const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo(); ::comphelper::UStringMixEqual aCase(false); // search for typeinfo where the typename is equal sTypeName - OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), + OTypeInfoMap::const_iterator aFind = std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(), [&aCase, &sTypeName] (const OTypeInfoMap::value_type& typeInfo) { return aCase(typeInfo.second->getDBName(), sTypeName); }); diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 77daa121cac0..c83d85d8c385 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -529,7 +529,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r const OExtendedTypeInfo* pTypeInfo = nullptr; _brForceToType = false; // search for type - ::std::pair<OTypeInfoMap::const_iterator, OTypeInfoMap::const_iterator> aPair = _rTypeInfo.equal_range(_nType); + std::pair<OTypeInfoMap::const_iterator, OTypeInfoMap::const_iterator> aPair = _rTypeInfo.equal_range(_nType); OTypeInfoMap::const_iterator aIter = aPair.first; if(aIter != _rTypeInfo.end()) // compare with end is correct here { @@ -586,7 +586,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r { ::comphelper::UStringMixEqual aCase(false); // search for typeinfo where the typename is equal _sTypeName - OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(), _rTypeInfo.end(), + OTypeInfoMap::const_iterator aFind = std::find_if(_rTypeInfo.begin(), _rTypeInfo.end(), [&aCase, &_sTypeName] (const OTypeInfoMap::value_type& typeInfo) { return aCase(typeInfo.second->getDBName(), _sTypeName); }); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 5be23aa03ead..e159863abb64 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -85,7 +85,7 @@ sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId) fillLiterals(); sal_Int32 nSize = 0; - ::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId); + std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId); if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported) nSize = (static_cast<sal_Int32>((*aIter).second.cchMaxLen) == (-1)) ? 0 : (*aIter).second.cchMaxLen; return nSize; @@ -96,7 +96,7 @@ bool ODatabaseMetaData::isCapable(sal_uInt32 _nId) if(m_aLiteralInfo.empty()) fillLiterals(); bool bSupported = false; - ::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId); + std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId); if(aIter != m_aLiteralInfo.end()) bSupported = (*aIter).second.fSupported; return bSupported; @@ -108,7 +108,7 @@ OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId) if(m_aLiteralInfo.empty()) fillLiterals(); OUString sStr; - ::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId); + std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId); if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported) sStr = (*aIter).second.pwszLiteralValue; return sStr; diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 09ee0797e09c..a411f9363c0f 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -898,7 +898,7 @@ void ODatabaseMetaDataResultSet::setColumnsMap() m_aValueRange[12] = aMap; - ::std::map< sal_Int32,OUString> aMap2; + std::map< sal_Int32,OUString> aMap2; aMap2[0] = "YES"; aMap2[1] = "NO"; m_aIntValueRange[18] = aMap2; @@ -1031,7 +1031,7 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap() aMap[1] = 0; m_aValueRange[8] = aMap2; - ::std::map< sal_Int32,OUString> aMap3; + std::map< sal_Int32,OUString> aMap3; aMap3[0] = ""; aMap3[DB_COLLATION_ASC] = "A"; aMap3[DB_COLLATION_DESC] = "D"; @@ -1054,7 +1054,7 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap() m_aColMapping.push_back(6); m_aColMapping.push_back(7); - ::std::map< sal_Int32,OUString> aMap; + std::map< sal_Int32,OUString> aMap; aMap[0] = "YES"; aMap[1] = "NO"; m_aIntValueRange[7] = aMap; @@ -1081,7 +1081,7 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap() m_aColMapping.push_back(16); m_aColMapping.push_back(18); - ::std::map< OUString,sal_Int32> aMap; + std::map< OUString,sal_Int32> aMap; aMap[ OUString("CASCADE")] = KeyRule::CASCADE; aMap[ OUString("RESTRICT")] = KeyRule::RESTRICT; aMap[ OUString("SET NULL")] = KeyRule::SET_NULL; @@ -1102,7 +1102,7 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(bool _bJetEngine) for(;i<19;i++) m_aColMapping.push_back(i); - ::std::map< OUString,sal_Int32> aMap1; + std::map< OUString,sal_Int32> aMap1; aMap1[ OUString()] = 10; m_aStrValueRange[18] = aMap1; diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index c6a22e761dbd..efda9a97820d 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -149,7 +149,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString impl_checkURL_throw(url); if ( acceptsURL(url) ) { - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; Sequence< OUString > aBooleanValues(2); aBooleanValues[0] = "false"; diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 136c3a90b377..8f4ef082aed4 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -238,7 +238,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { - setParameter( parameterIndex, adLongVarWChar, ::std::numeric_limits< sal_Int32 >::max(), x ); + setParameter( parameterIndex, adLongVarWChar, std::numeric_limits< sal_Int32 >::max(), x ); } Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 025be1b95b37..3e8d0f5d2e3b 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -214,10 +214,10 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType) aInfo.nType = (sal_Int16)sqlType; if (!m_aTypeInfo.empty()) { - ::std::vector<OTypeInfo>::const_iterator aIter = ::std::find(m_aTypeInfo.begin(),m_aTypeInfo.end(),aInfo); + std::vector<OTypeInfo>::const_iterator aIter = std::find(m_aTypeInfo.begin(),m_aTypeInfo.end(),aInfo); for(;aIter != m_aTypeInfo.end();++aIter) { - prec = ::std::max(prec,(*aIter).nPrecision); + prec = std::max(prec,(*aIter).nPrecision); } } @@ -352,7 +352,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) OUString aBatchSql; sal_Int32 nLen = 0; - for(::std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) + for(std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) aBatchSql = aBatchSql + *i + ";"; diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 97cf3fa98fcf..7777318cb1ae 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -645,7 +645,7 @@ void SAL_CALL OCalcTable::disposing() Sequence< Type > SAL_CALL OCalcTable::getTypes( ) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index 6e920abdf729..39a672f35840 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -78,7 +78,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString { if ( acceptsURL(url) ) { - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; Sequence< OUString > aBoolean(2); aBoolean[0] = "0"; diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 65ec2d36bc41..fba7c5f62d70 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -732,7 +732,7 @@ void SAL_CALL ODbaseTable::disposing() Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); @@ -1321,7 +1321,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo) throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName); } (*m_pFileStream).WriteUChar( std::min((unsigned)nPrecision, 255U) ); // field length - nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL); + nRecLength = nRecLength + (sal_uInt16)std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL); (*m_pFileStream).WriteUChar( 0 ); // decimals break; case 'F': @@ -1682,7 +1682,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo sal_uInt16 i; OUString aColName; const sal_Int32 nColumnCount = m_pColumns->getCount(); - ::std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount); + std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount); ::comphelper::UStringMixEqual aCase(isCaseSensitive()); @@ -1934,11 +1934,11 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo m_pColumns->getByIndex(i) >>= xCol; OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!"); xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName; - ::std::list< ::std::pair<const sal_Char* , OUString > > aStringToSubstitutes; - aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$columnname$", aColName)); - aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen))); - aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale))); - aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8))); + std::list< std::pair<const sal_Char* , OUString > > aStringToSubstitutes; + aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$columnname$", aColName)); + aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen))); + aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale))); + aStringToSubstitutes.push_back(std::pair<const sal_Char* , OUString >("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8))); const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMN_DECIMAL_VALUE @@ -2518,13 +2518,13 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) if(_nPos) { aInsertRow = new OValueRefVector(_pNewTable->m_pColumns->getCount()); - ::std::for_each(aInsertRow->get().begin(),aInsertRow->get().end(),TSetRefBound(true)); + std::for_each(aInsertRow->get().begin(),aInsertRow->get().end(),TSetRefBound(true)); } else aInsertRow = aRow; // we only have to bind the values which we need to copy into the new table - ::std::for_each(aRow->get().begin(),aRow->get().end(),TSetRefBound(true)); + std::for_each(aRow->get().begin(),aRow->get().end(),TSetRefBound(true)); if(_nPos && (_nPos < (sal_Int32)aRow->get().size())) (aRow->get())[nPos]->setBound(false); diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 171906d947ec..921384378a49 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -710,7 +710,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const else { sal_uInt16 const nLen(rIndex.getHeader().db_keylen); - ::std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[nLen]); + std::unique_ptr<sal_uInt8[]> pBuf(new sal_uInt8[nLen]); memset(&pBuf[0], 0x20, nLen); if (!aKey.getValue().isNull()) { diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 95cdc50d3176..51bfd46d4d1f 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -57,7 +57,7 @@ namespace connectivity }; - ::std::vector< Parameter> m_aParameters; + std::vector< Parameter> m_aParameters; // Data attributes diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 12accaf71d3e..b2722e0076ee 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx @@ -37,7 +37,7 @@ namespace connectivity class OEvoabResultSetMetaData : public OResultSetMetaData_BASE { OUString m_aTableName; - ::std::vector<sal_Int32> m_aEvoabFields; + std::vector<sal_Int32> m_aEvoabFields; protected: virtual ~OEvoabResultSetMetaData() override; diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index c5cc7ef510e0..7c9711cc03a2 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -60,7 +60,7 @@ namespace connectivity FieldSort() : nField(0), bAscending( true ) { } FieldSort( const sal_Int32 _nField, const bool _bAscending ) : nField( _nField ), bAscending( _bAscending ) { } }; - typedef ::std::vector< FieldSort > SortDescriptor; + typedef std::vector< FieldSort > SortDescriptor; enum QueryFilterType { diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index a5bcd71948c5..1a839caa4c0b 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -83,7 +83,7 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) typedef sdbcx::OCatalog OFileCatalog_BASE; Sequence< Type > aTypes = OFileCatalog_BASE::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index 41a6784b95e8..c5cfac4c16e8 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.cxx @@ -195,7 +195,7 @@ ORowSetValue OOp_Quarter::operate(const ORowSetValue& lhs) const return nRet; } -ORowSetValue OOp_Week::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Week::operate(const std::vector<ORowSetValue>& lhs) const { if ( lhs.empty() || lhs.size() > 2 ) return ORowSetValue(); @@ -248,7 +248,7 @@ ORowSetValue OOp_Second::operate(const ORowSetValue& lhs) const return static_cast<sal_Int16>(aT.Seconds); } -ORowSetValue OOp_CurDate::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_CurDate::operate(const std::vector<ORowSetValue>& lhs) const { if ( !lhs.empty() ) return ORowSetValue(); @@ -257,7 +257,7 @@ ORowSetValue OOp_CurDate::operate(const ::std::vector<ORowSetValue>& lhs) const return aCurDate.GetUNODate(); } -ORowSetValue OOp_CurTime::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_CurTime::operate(const std::vector<ORowSetValue>& lhs) const { if ( !lhs.empty() ) return ORowSetValue(); @@ -266,7 +266,7 @@ ORowSetValue OOp_CurTime::operate(const ::std::vector<ORowSetValue>& lhs) const return aCurTime.GetUNOTime(); } -ORowSetValue OOp_Now::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Now::operate(const std::vector<ORowSetValue>& lhs) const { if ( !lhs.empty() ) return ORowSetValue(); diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index ad77694e01cd..2a99cb1b02ce 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -113,7 +113,7 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt { if ( acceptsURL(url) ) { - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; Sequence< OUString > aBoolean(2); aBoolean[0] = "0"; diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx index 236e846c39c3..9fad4f8d3acc 100644 --- a/connectivity/source/drivers/file/FNoException.cxx +++ b/connectivity/source/drivers/file/FNoException.cxx @@ -67,7 +67,7 @@ void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow) } } -void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes) +void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,std::vector< OSQLParseNode*>& _rParaNodes) { DBG_ASSERT(pParseNode != nullptr,"OResultSet: interner Fehler: ungueltiger ParseNode"); @@ -93,7 +93,7 @@ OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow) OKeyValue* pKeyValue = OKeyValue::createKeyValue((sal_uInt32)nBookmarkValue); - ::std::vector<sal_Int32>::const_iterator aIter = m_aOrderbyColumnNumber.begin(); + std::vector<sal_Int32>::const_iterator aIter = m_aOrderbyColumnNumber.begin(); for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter) { OSL_ENSURE(*aIter < static_cast<sal_Int32>(_rRow->get().size()),"Invalid index for orderkey values!"); diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx index b749c3f9f317..6bafc9641496 100644 --- a/connectivity/source/drivers/file/FNumericFunctions.cxx +++ b/connectivity/source/drivers/file/FNumericFunctions.cxx @@ -78,7 +78,7 @@ ORowSetValue OOp_Ceiling::operate(const ORowSetValue& lhs) const return ceil(nVal); } -ORowSetValue OOp_Round::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Round::operate(const std::vector<ORowSetValue>& lhs) const { if ( lhs.empty() || lhs.size() > 2 ) return ORowSetValue(); @@ -113,7 +113,7 @@ ORowSetValue OOp_Ln::operate(const ORowSetValue& lhs) const return nVal; } -ORowSetValue OOp_Log::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Log::operate(const std::vector<ORowSetValue>& lhs) const { if ( lhs.empty() || lhs.size() > 2 ) return ORowSetValue(); @@ -160,7 +160,7 @@ ORowSetValue OOp_Sqrt::operate(const ORowSetValue& lhs) const return nVal; } -ORowSetValue OOp_Pi::operate(const ::std::vector<ORowSetValue>& /*lhs*/) const +ORowSetValue OOp_Pi::operate(const std::vector<ORowSetValue>& /*lhs*/) const { return fPi; } diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 22f3449e4aaf..2e508ce3226c 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -482,7 +482,7 @@ void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode void OPreparedStatement::describeParameter() { - ::std::vector< OSQLParseNode*> aParseNodes; + std::vector< OSQLParseNode*> aParseNodes; scanParameter(m_pParseTree,aParseNodes); if ( !aParseNodes.empty() ) { @@ -491,7 +491,7 @@ void OPreparedStatement::describeParameter() if( !rTabs.empty() ) { OSQLTable xTable = rTabs.begin()->second; - ::std::vector< OSQLParseNode*>::const_iterator aIter = aParseNodes.begin(); + std::vector< OSQLParseNode*>::const_iterator aIter = aParseNodes.begin(); for (;aIter != aParseNodes.end();++aIter ) { describeColumn(*aIter,(*aIter)->getParent()->getChild(0),xTable); diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index f1ef8644e27d..88c7ef4f1294 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -1115,8 +1115,8 @@ void OResultSet::sortRows() } OSortIndex::TKeyTypeVector eKeyType(m_aOrderbyColumnNumber.size()); - ::std::vector<sal_Int32>::const_iterator aOrderByIter = m_aOrderbyColumnNumber.begin(); - for (::std::vector<sal_Int16>::size_type i=0;aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i) + std::vector<sal_Int32>::const_iterator aOrderByIter = m_aOrderbyColumnNumber.begin(); + for (std::vector<sal_Int16>::size_type i=0;aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i) { OSL_ENSURE((sal_Int32)m_aSelectRow->get().size() > *aOrderByIter,"Invalid Index"); switch ((*(m_aSelectRow->get().begin()+*aOrderByIter))->getValue().getTypeKind()) @@ -1261,7 +1261,7 @@ bool OResultSet::OpenImpl() for (size_t i = 1; // 0: bookmark (see setBoundedColumns) i < m_aColMapping.size(); ++i) { - if (::std::find(m_aOrderbyColumnNumber.begin(), + if (std::find(m_aOrderbyColumnNumber.begin(), m_aOrderbyColumnNumber.end(), i) == m_aOrderbyColumnNumber.end()) { @@ -1348,8 +1348,8 @@ bool OResultSet::OpenImpl() #endif } - m_pFileSet->get().erase(::std::remove_if(m_pFileSet->get().begin(),m_pFileSet->get().end(), - ::std::bind2nd(::std::equal_to<sal_Int32>(),0)) + m_pFileSet->get().erase(std::remove_if(m_pFileSet->get().begin(),m_pFileSet->get().end(), + std::bind2nd(std::equal_to<sal_Int32>(),0)) ,m_pFileSet->get().end()); } } @@ -1432,7 +1432,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, const Reference<XIndexAccess>& _xNames, bool _bSetColumnMapping, const Reference<XDatabaseMetaData>& _xMetaData, - ::std::vector<sal_Int32>& _rColMapping) + std::vector<sal_Int32>& _rColMapping) { ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); @@ -1443,7 +1443,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); const OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); - typedef ::std::map<OSQLColumns::Vector::iterator,sal_Bool> IterMap; + typedef std::map<OSQLColumns::Vector::iterator,sal_Bool> IterMap; IterMap aSelectIters; OValueRefVector::Vector::const_iterator aRowIter = _rRow->get().begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column @@ -1590,7 +1590,7 @@ void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount) { _rRow = new OValueRefVector(_nColumnCount); (_rRow->get())[0]->setBound(true); - ::std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetRefBound(false)); + std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetRefBound(false)); } } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 6d91496c378f..3980d86a0bf4 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -416,17 +416,17 @@ void OStatement_Base::construct(const OUString& sql) // set the binding of the resultrow m_aRow = new OValueRefVector(xNames->getCount()); (m_aRow->get())[0]->setBound(true); - ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetRefBound(false)); + std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetRefBound(false)); // set the binding of the resultrow m_aEvaluateRow = new OValueRefVector(xNames->getCount()); (m_aEvaluateRow->get())[0]->setBound(true); - ::std::for_each(m_aEvaluateRow->get().begin()+1,m_aEvaluateRow->get().end(),TSetRefBound(false)); + std::for_each(m_aEvaluateRow->get().begin()+1,m_aEvaluateRow->get().end(),TSetRefBound(false)); // set the select row m_aSelectRow = new OValueRefVector(m_aSQLIterator.getSelectColumns()->get().size()); - ::std::for_each(m_aSelectRow->get().begin(),m_aSelectRow->get().end(),TSetRefBound(true)); + std::for_each(m_aSelectRow->get().begin(),m_aSelectRow->get().end(),TSetRefBound(true)); // create the column mapping createColumnMapping(); @@ -492,12 +492,12 @@ void OStatement_Base::GetAssignValues() sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount(); m_aAssignValues = new OAssignValues(nCount); // unbound all - ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(false)); + std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(false)); m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER); // List of Column-Names, that exist in the column_commalist (separated by ;): - ::std::vector<OUString> aColumnNameList; + std::vector<OUString> aColumnNameList; OSL_ENSURE(m_pParseTree->count() >= 4,"OResultSet: Fehler im Parse Tree"); @@ -579,7 +579,7 @@ void OStatement_Base::GetAssignValues() sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount(); m_aAssignValues = new OAssignValues(nCount); // unbound all - ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(false)); + std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(false)); m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER); @@ -591,7 +591,7 @@ void OStatement_Base::GetAssignValues() OSL_ENSURE(pAssignmentCommalist->count() > 0,"OResultSet: pAssignmentCommalist->count() <= 0"); // work on all assignments (commalist) ... - ::std::vector< OUString> aList(1); + std::vector< OUString> aList(1); for (size_t i = 0; i < pAssignmentCommalist->count(); i++) { OSQLParseNode * pAssignment = pAssignmentCommalist->getChild(i); @@ -619,7 +619,7 @@ void OStatement_Base::GetAssignValues() } } -void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnNameList,OSQLParseNode* pRow_Value_Constructor_Elem, sal_Int32 nIndex) +void OStatement_Base::ParseAssignValues(const std::vector< OUString>& aColumnNameList,OSQLParseNode* pRow_Value_Constructor_Elem, sal_Int32 nIndex) { OSL_ENSURE(size_t(nIndex) <= aColumnNameList.size(),"SdbFileCursor::ParseAssignValues: nIndex > aColumnNameList.GetTokenCount()"); OUString aColumnName(aColumnNameList[nIndex]); diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx index f19dbc207db5..be10a9ed8a6d 100644 --- a/connectivity/source/drivers/file/FStringFunctions.cxx +++ b/connectivity/source/drivers/file/FStringFunctions.cxx @@ -57,14 +57,14 @@ ORowSetValue OOp_CharLength::operate(const ORowSetValue& lhs) const return lhs.getString().getLength(); } -ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Char::operate(const std::vector<ORowSetValue>& lhs) const { if ( lhs.empty() ) return ORowSetValue(); OUString sRet; - ::std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin(); - ::std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend(); + std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin(); + std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend(); for (; aIter != aEnd; ++aIter) { if ( !aIter->isNull() ) @@ -78,14 +78,14 @@ ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const return sRet; } -ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Concat::operate(const std::vector<ORowSetValue>& lhs) const { if ( lhs.empty() ) return ORowSetValue(); OUStringBuffer sRet; - ::std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin(); - ::std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend(); + std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin(); + std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend(); for (; aIter != aEnd; ++aIter) { if ( aIter->isNull() ) @@ -97,10 +97,10 @@ ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const return sRet.makeStringAndClear(); } -ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Locate::operate(const std::vector<ORowSetValue>& lhs) const { - ::std::vector<ORowSetValue>::const_iterator aIter = lhs.begin(); - ::std::vector<ORowSetValue>::const_iterator aEnd = lhs.end(); + std::vector<ORowSetValue>::const_iterator aIter = lhs.begin(); + std::vector<ORowSetValue>::const_iterator aEnd = lhs.end(); for (; aIter != aEnd; ++aIter) { if ( aIter->isNull() ) @@ -115,10 +115,10 @@ ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const return lhs[1].getString().indexOf(lhs[2].getString(),lhs[0]) + 1; } -ORowSetValue OOp_SubString::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_SubString::operate(const std::vector<ORowSetValue>& lhs) const { - ::std::vector<ORowSetValue>::const_iterator aIter = lhs.begin(); - ::std::vector<ORowSetValue>::const_iterator aEnd = lhs.end(); + std::vector<ORowSetValue>::const_iterator aIter = lhs.begin(); + std::vector<ORowSetValue>::const_iterator aEnd = lhs.end(); for (; aIter != aEnd; ++aIter) { if ( aIter->isNull() ) @@ -168,7 +168,7 @@ ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const return sRet.makeStringAndClear(); } -ORowSetValue OOp_Replace::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Replace::operate(const std::vector<ORowSetValue>& lhs) const { if ( lhs.size() != 3 ) return ORowSetValue(); @@ -200,7 +200,7 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs return sRet; } -ORowSetValue OOp_Insert::operate(const ::std::vector<ORowSetValue>& lhs) const +ORowSetValue OOp_Insert::operate(const std::vector<ORowSetValue>& lhs) const { if ( lhs.size() != 4 ) return ORowSetValue(); diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 7f37053879c7..a64268cb8746 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -132,7 +132,7 @@ void OSQLAnalyzer::bindRow(OCodeList& rCodeList,const OValueRefRow& _pRow) void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow) { // first the select part - for ( ::std::vector< TPredicates >::const_iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter) + for ( std::vector< TPredicates >::const_iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter) { if ( aIter->first.is() ) bindRow(aIter->first->m_aCodeList,_pRow); @@ -161,7 +161,7 @@ bool OSQLAnalyzer::hasFunctions() const if ( m_bSelectionFirstTime ) { m_bSelectionFirstTime = false; - for ( ::std::vector< TPredicates >::const_iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end() && !m_bHasSelectionCode ;++aIter) + for ( std::vector< TPredicates >::const_iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end() && !m_bHasSelectionCode ;++aIter) { if ( aIter->first.is() ) m_bHasSelectionCode = aIter->first->hasCode(); @@ -170,10 +170,10 @@ bool OSQLAnalyzer::hasFunctions() const return m_bHasSelectionCode; } -void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping) +void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const std::vector<sal_Int32>& _rColumnMapping) { sal_Int32 nPos = 1; - for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter,++nPos) + for ( std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter,++nPos) { if ( aIter->second.is() ) { @@ -190,7 +190,7 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std: void OSQLAnalyzer::dispose() { m_aCompiler->dispose(); - for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter) + for ( std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter) { if ( aIter->first.is() ) aIter->first->dispose(); @@ -200,7 +200,7 @@ void OSQLAnalyzer::dispose() void OSQLAnalyzer::setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols) { m_aCompiler->setOrigColumns(rCols); - for ( ::std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter) + for ( std::vector< TPredicates >::iterator aIter = m_aSelectionEvaluations.begin(); aIter != m_aSelectionEvaluations.end();++aIter) { if ( aIter->first.is() ) aIter->first->setOrigColumns(rCols); diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 1a496de16479..48a7a38d6298 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -337,8 +337,8 @@ double OOp_DIV::operate(const double& fLeft,const double& fRight) const void ONthOperator::Exec(OCodeStack& rCodeStack) { - ::std::vector<ORowSetValue> aValues; - ::std::vector<OOperand*> aOperands; + std::vector<ORowSetValue> aValues; + std::vector<OOperand*> aOperands; OOperand* pOperand; do { @@ -354,8 +354,8 @@ void ONthOperator::Exec(OCodeStack& rCodeStack) rCodeStack.push(new OOperandResult(operate(aValues))); - ::std::vector<OOperand*>::iterator aIter = aOperands.begin(); - ::std::vector<OOperand*>::const_iterator aEnd = aOperands.end(); + std::vector<OOperand*>::iterator aIter = aOperands.begin(); + std::vector<OOperand*>::const_iterator aEnd = aOperands.end(); for (; aIter != aEnd; ++aIter) { if (typeid(OOperandResult) == typeid(*(*aIter))) diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 6c6df60beffd..5e5c321d3646 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -64,7 +64,7 @@ namespace connectivity class ODatabaseMetaData; - typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; + typedef std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray; class Connection : public Connection_BASE, diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index e773e09b41eb..a7e89b21d700 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -1522,7 +1522,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( aCurrentRow[5] = new ORowSetValueDecorator(); // FKTABLE_CAT unsupported aCurrentRow[6] = new ORowSetValueDecorator(); // FKTABLE_SCHEM unsupported - ::std::map< OUString,sal_Int32> aRuleMap; + std::map< OUString,sal_Int32> aRuleMap; aRuleMap[ OUString("CASCADE")] = KeyRule::CASCADE; aRuleMap[ OUString("RESTRICT")] = KeyRule::RESTRICT; aRuleMap[ OUString("SET NULL")] = KeyRule::SET_NULL; diff --git a/connectivity/source/drivers/firebird/Indexes.hxx b/connectivity/source/drivers/firebird/Indexes.hxx index 9ecc96eefd00..236a0ff064ae 100644 --- a/connectivity/source/drivers/firebird/Indexes.hxx +++ b/connectivity/source/drivers/firebird/Indexes.hxx @@ -34,7 +34,7 @@ namespace connectivity public: Indexes(Table* pTable, ::osl::Mutex& rMutex, - const ::std::vector< ::rtl::OUString>& rVector); + const std::vector< ::rtl::OUString>& rVector); }; } // namespace firebird diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx index dd0faf720b52..9a452956e3b6 100644 --- a/connectivity/source/drivers/firebird/Util.hxx +++ b/connectivity/source/drivers/firebird/Util.hxx @@ -24,7 +24,7 @@ namespace connectivity { namespace firebird { - typedef ::std::vector< OString > OStringVector; + typedef std::vector< OString > OStringVector; // Type Blob has 2 subtypes values // 0 for BLOB, 1 for CLOB // see http://www.firebirdfaq.org/faq48/ diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 3eea3918164a..8c1681a8cd26 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -81,7 +81,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString { if ( acceptsURL(url) ) { - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; Sequence< OUString > aBoolean(2); aBoolean[0] = "0"; diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 60e0e851e465..890868c86026 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -75,7 +75,7 @@ Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) { Sequence< Type > aTypes = OResultSet::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index 10616c202aed..2864042b80e2 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -133,7 +133,7 @@ Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) Sequence< Type > SAL_CALL OHCatalog::getTypes( ) { Sequence< Type > aTypes = OCatalog::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index abcd6d23f301..36abefe200d3 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -408,7 +408,7 @@ namespace connectivity { if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; aDriverInfo.push_back(DriverPropertyInfo( "Storage" ,"Defines the storage where the database will be stored." @@ -577,7 +577,7 @@ namespace connectivity if ( xStorage.is() ) { OUString sKey = StorageContainer::getRegisteredKey(xStorage); - TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(), + TWeakPairVector::iterator i = std::find_if(m_aConnections.begin(),m_aConnections.end(), [&sKey] (const TWeakPairVector::value_type& conn) { return conn.second.first == sKey; }); @@ -633,7 +633,7 @@ namespace connectivity OUString sKey = StorageContainer::getRegisteredKey(xStorage); if ( !sKey.isEmpty() ) { - TWeakPairVector::const_iterator i = ::std::find_if(m_aConnections.begin(), m_aConnections.end(), + TWeakPairVector::const_iterator i = std::find_if(m_aConnections.begin(), m_aConnections.end(), [&sKey] (const TWeakPairVector::value_type& conn) { return conn.second.first == sKey; }); diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 6e43cd9cb183..fe1c184d7e99 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -191,7 +191,7 @@ namespace connectivity OSL_ENSURE(_xStorage.is(),"Storage is NULL!"); TStorages& rMap = lcl_getStorageMap(); // check if the storage is already in our map - TStorages::const_iterator aFind = ::std::find_if(rMap.begin(),rMap.end(), + TStorages::const_iterator aFind = std::find_if(rMap.begin(),rMap.end(), [&_xStorage] (const TStorages::value_type& storage) { return storage.second.mapStorage() == _xStorage; }); @@ -222,7 +222,7 @@ namespace connectivity OSL_ENSURE(_xStorage.is(),"Storage is NULL!"); TStorages& rMap = lcl_getStorageMap(); // check if the storage is already in our map - TStorages::const_iterator aFind = ::std::find_if(rMap.begin(),rMap.end(), + TStorages::const_iterator aFind = std::find_if(rMap.begin(),rMap.end(), [&_xStorage] (const TStorages::value_type& storage) { return storage.second.mapStorage() == _xStorage; }); diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 6bcecb57509a..af99e0e5b467 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -343,7 +343,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) if ( m_Type == "VIEW" ) { Sequence< Type > aTypes = OTableHelper::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pIter = aTypes.getConstArray(); const Type* pEnd = pIter + aTypes.getLength(); diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index 49df4672300a..81f06835d520 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -159,8 +159,8 @@ extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stor try { do { - if (tmpLongVal >= ::std::numeric_limits<sal_Int64>::max() ) - tmpIntVal = ::std::numeric_limits<sal_Int32>::max(); + if (tmpLongVal >= std::numeric_limits<sal_Int64>::max() ) + tmpIntVal = std::numeric_limits<sal_Int32>::max(); else // Casting is safe here. tmpIntVal = static_cast<sal_Int32>(tmpLongVal); diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index f0dcd168cbb7..5697c71908d5 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -430,7 +430,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( if ( xMeta.is() && xMeta->getColumnCount() != 7 ) { // here we know that the count of column doesn't match - ::std::map<sal_Int32,sal_Int32> aColumnMatching; + std::map<sal_Int32,sal_Int32> aColumnMatching; static const OUStringLiteral sPrivs[] = { "TABLE_CAT", "TABLE_SCHEM", @@ -450,7 +450,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( { if ( sPrivs[j] == sColumnName ) { - aColumnMatching.insert( ::std::map<sal_Int32,sal_Int32>::value_type(i,j+1) ); + aColumnMatching.insert( std::map<sal_Int32,sal_Int32>::value_type(i,j+1) ); break; } } @@ -467,8 +467,8 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( ODatabaseMetaDataResultSet::ORow aRow(8); while ( xRow.is() && xTemp->next() ) { - ::std::map<sal_Int32,sal_Int32>::const_iterator aIter = aColumnMatching.begin(); - ::std::map<sal_Int32,sal_Int32>::const_iterator aEnd = aColumnMatching.end(); + std::map<sal_Int32,sal_Int32>::const_iterator aIter = aColumnMatching.begin(); + std::map<sal_Int32,sal_Int32>::const_iterator aEnd = aColumnMatching.end(); for (;aIter != aEnd ; ++aIter) { sValue = xRow->getString(aIter->first); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index af83a5c406b1..2a9c894aa4f9 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -131,7 +131,7 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const { if ( acceptsURL(url) ) { - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; Sequence< OUString > aBooleanValues(2); aBooleanValues[0] = "false"; diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 87259c28dbbe..ccee37942388 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -132,7 +132,7 @@ Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) Sequence< Type > aOldTypes = java_sql_Statement_BASE::getTypes(); if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() ) { - ::std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(), + std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(), cppu::UnoType<XGeneratedResultSet>::get()); aOldTypes.realloc(aOldTypes.getLength() - 1); } diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx index f1e9348e55c6..c5052380c77e 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx @@ -36,7 +36,7 @@ namespace connectivity class KabResultSetMetaData : public KabResultSetMetaData_BASE { - ::std::vector<sal_Int32> m_aKabFields; // for each selected column, contains the number + std::vector<sal_Int32> m_aKabFields; // for each selected column, contains the number // of the corresponding KAddressBook field protected: diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index 197b938f4266..43b0adb9feb0 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -52,7 +52,7 @@ namespace connectivity css::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< OUString> m_aBatchList; + std::list< OUString> m_aBatchList; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode* m_pParseTree; diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx index 6bcc6aab5b10..000d3f782fdc 100644 --- a/connectivity/source/drivers/kab/korder.hxx +++ b/connectivity/source/drivers/kab/korder.hxx @@ -51,7 +51,7 @@ namespace connectivity class KabComplexOrder : public KabOrder { - ::std::vector<KabOrder *> m_aOrders; + std::vector<KabOrder *> m_aOrders; public: KabComplexOrder(); diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx index a7a9bda10f3b..83c412d74f03 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.cxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx @@ -35,13 +35,13 @@ using namespace ::com::sun::star::uno; namespace { -void manageDuplicateGroups(::std::vector<MacabGroup *> _xGroups) +void manageDuplicateGroups(std::vector<MacabGroup *> _xGroups) { /* If we have two cases of groups, say, family, this makes it: * family * family (2) */ - ::std::vector<MacabGroup *>::reverse_iterator iter1, iter2; + std::vector<MacabGroup *>::reverse_iterator iter1, iter2; sal_Int32 count; for(iter1 = _xGroups.rbegin(); iter1 != _xGroups.rend(); ++iter1) @@ -95,7 +95,7 @@ MacabAddressBook::~MacabAddressBook() if(!m_xMacabGroups.empty()) { - ::std::vector<MacabGroup *>::iterator iter, end; + std::vector<MacabGroup *>::iterator iter, end; iter = m_xMacabGroups.begin(); end = m_xMacabGroups.end(); for( ; iter != end; ++iter) @@ -160,7 +160,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString& _tableName) } -::std::vector<MacabGroup *> MacabAddressBook::getMacabGroups() +std::vector<MacabGroup *> MacabAddressBook::getMacabGroups() { /* If the MacabGroups haven't been created yet, create them. */ if(!m_bRetrievedGroups) @@ -175,7 +175,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString& _tableName) CFArrayRef allGroups = ABCopyArrayOfAllGroups(m_aAddressBook); sal_Int32 nGroups = CFArrayGetCount(allGroups); - m_xMacabGroups = ::std::vector<MacabGroup *>(nGroups); + m_xMacabGroups = std::vector<MacabGroup *>(nGroups); sal_Int32 i; ABGroupRef xGroup; diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx index bd2070651bed..a74621ef2a39 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.hxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx @@ -39,7 +39,7 @@ namespace connectivity protected: ABAddressBookRef m_aAddressBook; MacabRecords *m_xMacabRecords; - ::std::vector<MacabGroup *> m_xMacabGroups; + std::vector<MacabGroup *> m_xMacabGroups; bool m_bRetrievedGroups; public: @@ -48,7 +48,7 @@ namespace connectivity static const OUString & getDefaultTableName(); MacabRecords *getMacabRecords(); - ::std::vector<MacabGroup *> getMacabGroups(); + std::vector<MacabGroup *> getMacabGroups(); MacabGroup *getMacabGroup(const OUString& _groupName); MacabRecords *getMacabRecords(const OUString& _tableName); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index 0dbeb5a4b328..2f520d387cfc 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -991,7 +991,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( ODatabaseMetaDataResultSet::ORow aRow(6); MacabRecords *xRecords = m_xConnection->getAddressBook()->getMacabRecords(); - ::std::vector<MacabGroup *> xGroups = m_xConnection->getAddressBook()->getMacabGroups(); + std::vector<MacabGroup *> xGroups = m_xConnection->getAddressBook()->getMacabGroups(); sal_Int32 i, nGroups; nGroups = xGroups.size(); diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index ac795313484a..08af06976852 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx @@ -40,7 +40,7 @@ namespace connectivity { MacabConnection* m_pConnection; OUString m_sTableName; - ::std::vector<sal_Int32> m_aMacabFields; // for each selected column, contains the number + std::vector<sal_Int32> m_aMacabFields; // for each selected column, contains the number // of the corresponding AddressBook field protected: diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index ff80b2b4bf79..9d956f6a8d98 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -54,7 +54,7 @@ namespace connectivity css::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< OUString> m_aBatchList; + std::list< OUString> m_aBatchList; connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode* m_pParseTree; diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx index dc603004274c..8312091dbfbc 100644 --- a/connectivity/source/drivers/macab/macaborder.hxx +++ b/connectivity/source/drivers/macab/macaborder.hxx @@ -51,7 +51,7 @@ namespace connectivity class MacabComplexOrder : public MacabOrder { - ::std::vector<MacabOrder *> m_aOrders; + std::vector<MacabOrder *> m_aOrders; public: MacabComplexOrder(); diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 5bb771428786..5497693ffed9 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -62,7 +62,7 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( aRows.clear(); ::osl::MutexGuard aGuard( m_aMutex ); - ::std::vector< OUString > tables; + std::vector< OUString > tables; if (!connectivity::mork::MDatabaseMetaDataHelper::getTableStrings(m_pConnection, tables)) { ::connectivity::SharedResources aResources; @@ -951,7 +951,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); Reference< XResultSet > xRef = pResult; - ::std::vector< OUString > tables; + std::vector< OUString > tables; if ( !connectivity::mork::MDatabaseMetaDataHelper::getTableStrings( m_pConnection, tables) ) { ::connectivity::SharedResources aResources; diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx index 3ffb8004285e..582f96428ffd 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx @@ -39,7 +39,7 @@ MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper() } bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _pCon, - ::std::vector< OUString >& _rStrings) + std::vector< OUString >& _rStrings) { SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::getTableStrings()"); @@ -51,7 +51,7 @@ bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _pCon, std::set<std::string> lists; MorkParser* pMork = _pCon->getMorkParser("AddressBook"); pMork->retrieveLists(lists); - for (::std::set<std::string>::const_iterator iter = lists.begin(); iter != lists.end(); ++iter) { + for (std::set<std::string>::const_iterator iter = lists.begin(); iter != lists.end(); ++iter) { OUString groupTableName = OStringToOUString((*iter).c_str(), RTL_TEXTENCODING_UTF8); SAL_INFO("connectivity.mork", "add Table " << groupTableName); @@ -63,7 +63,7 @@ bool MDatabaseMetaDataHelper::getTableStrings( OConnection* _pCon, std::set<std::string> lists_history; pMork = _pCon->getMorkParser("CollectedAddressBook"); pMork->retrieveLists(lists_history); - for (::std::set<std::string>::const_iterator iter = lists_history.begin(); iter != lists_history.end(); ++iter) { + for (std::set<std::string>::const_iterator iter = lists_history.begin(); iter != lists_history.end(); ++iter) { OUString groupTableName = OStringToOUString((*iter).c_str(), RTL_TEXTENCODING_UTF8); SAL_INFO("connectivity.mork", "add Table " << groupTableName); @@ -91,7 +91,7 @@ bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon, ODatabaseMetaDataResultSet::ORows().swap(aRows); // this makes real clear where memory is freed as well aRows.clear(); - ::std::vector< OUString > tables; + std::vector< OUString > tables; if ( !getTableStrings( _pCon, tables ) ) return false; diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index 591e4bb066f2..47ec10ff991c 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -24,7 +24,7 @@ namespace connectivity static bool getTableStrings( OConnection* _pCon, - ::std::vector< OUString >& _rStrings); + std::vector< OUString >& _rStrings); static bool getTables( OConnection* _pCon, const OUString& tableNamePattern, diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 82a7a3aac69c..03132a9d1728 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -427,7 +427,7 @@ _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable) void OPreparedStatement::describeParameter() { - ::std::vector< OSQLParseNode*> aParseNodes; + std::vector< OSQLParseNode*> aParseNodes; scanParameter(m_pParseTree,aParseNodes); if(!aParseNodes.empty()) { @@ -436,7 +436,7 @@ void OPreparedStatement::describeParameter() if(rTabs.size()) { OSQLTable xTable = rTabs.begin()->second; - ::std::vector< OSQLParseNode*>::const_iterator aIter = + std::vector< OSQLParseNode*>::const_iterator aIter = aParseNodes.begin(); for (;aIter != aParseNodes.end();++aIter ) { @@ -447,7 +447,7 @@ aParseNodes.begin(); } -void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes) +void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,std::vector< OSQLParseNode*>& _rParaNodes) { OSL_ENSURE(pParseNode != nullptr,"OResultSet: internal error: invalid ParseNode"); diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index bb4d2772326f..8a0f65232cd7 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -68,7 +68,7 @@ namespace connectivity void AddParameter(connectivity::OSQLParseNode * pParameter, const css::uno::Reference< css::beans::XPropertySet>& _xCol); - void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); + void scanParameter(OSQLParseNode* pParseNode,std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); void describeParameter(); diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index e13e6899dddb..cfea0be76e83 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::sdbc; extern -::std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry); +std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry); MQueryHelperResultEntry::MQueryHelperResultEntry() { @@ -239,9 +239,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 ); entry->setValue(key, valueOUString); } - ::std::vector<bool> vector = entryMatchedByExpression(this, &expr, entry); + std::vector<bool> vector = entryMatchedByExpression(this, &expr, entry); bool result = true; - for (::std::vector<bool>::const_iterator iter = vector.begin(); iter != vector.end(); ++iter) + for (std::vector<bool>::const_iterator iter = vector.begin(); iter != vector.end(); ++iter) { result = result && *iter; } @@ -259,9 +259,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression return 0; } -::std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry) +std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry) { - ::std::vector<bool> resultVector; + std::vector<bool> resultVector; MQueryExpression::ExprVector::const_iterator evIter; for( evIter = _aExpr->getExpressions().begin(); evIter != _aExpr->getExpressions().end(); @@ -322,17 +322,17 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression SAL_INFO("connectivity.mork", "Appending Subquery Expression"); MQueryExpression* queryExpression = static_cast<MQueryExpression*> (*evIter); // recursive call - ::std::vector<bool> subquery_result = entryMatchedByExpression(_aQuery, queryExpression, entry); + std::vector<bool> subquery_result = entryMatchedByExpression(_aQuery, queryExpression, entry); MQueryExpression::bool_cond condition = queryExpression->getExpressionCondition(); if (condition == MQueryExpression::OR) { bool result = false; - for (::std::vector<bool>::const_iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) { + for (std::vector<bool>::const_iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) { result = result || *iter; } resultVector.push_back(result); } else if (condition == MQueryExpression::AND) { bool result = true; - for (::std::vector<bool>::const_iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) { + for (std::vector<bool>::const_iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) { result = result && *iter; } resultVector.push_back(result); diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 3861b5791a16..8e8d1aac00bb 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -101,7 +101,7 @@ namespace connectivity friend class MQueryHelper; public: - typedef ::std::vector< MQueryExpressionBase* > ExprVector; + typedef std::vector< MQueryExpressionBase* > ExprVector; typedef enum { AND, diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 35c57fced63e..e0cfea8cb5f7 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -1100,8 +1100,8 @@ void SAL_CALL OResultSet::executeQuery() } OSortIndex::TKeyTypeVector eKeyType(m_aOrderbyColumnNumber.size()); - ::std::vector<sal_Int32>::const_iterator aOrderByIter = m_aOrderbyColumnNumber.begin(); - for ( ::std::vector<sal_Int16>::size_type i = 0; aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i) + std::vector<sal_Int32>::const_iterator aOrderByIter = m_aOrderbyColumnNumber.begin(); + for ( std::vector<sal_Int16>::size_type i = 0; aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i) { OSL_ENSURE((sal_Int32)m_aRow->get().size() > *aOrderByIter,"Invalid Index"); switch ((m_aRow->get().begin()+*aOrderByIter)->getTypeKind()) @@ -1147,7 +1147,7 @@ void SAL_CALL OResultSet::executeQuery() OSortIndex aSortIndex(eKeyType,m_aOrderbyAscending); #if OSL_DEBUG_LEVEL > 0 - for ( ::std::vector<sal_Int32>::size_type i = 0; i < m_aColMapping.size(); i++ ) + for ( std::vector<sal_Int32>::size_type i = 0; i < m_aColMapping.size(); i++ ) SAL_INFO( "connectivity.mork", "Mapped: " << i << " -> " << m_aColMapping[i]); @@ -1156,7 +1156,7 @@ void SAL_CALL OResultSet::executeQuery() OKeyValue* pKeyValue = OKeyValue::createKeyValue((nRow)); - ::std::vector<sal_Int32>::const_iterator aIter = m_aOrderbyColumnNumber.begin(); + std::vector<sal_Int32>::const_iterator aIter = m_aOrderbyColumnNumber.begin(); for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter) { const ORowSetValue& value = getValue(nRow, *aIter); @@ -1206,8 +1206,8 @@ void SAL_CALL OResultSet::executeQuery() } } // Now remove any keys marked with a 0 - m_pKeySet->get().erase(::std::remove_if(m_pKeySet->get().begin(),m_pKeySet->get().end() - ,::std::bind2nd(::std::equal_to<sal_Int32>(),0)) + m_pKeySet->get().erase(std::remove_if(m_pKeySet->get().begin(),m_pKeySet->get().end() + ,std::bind2nd(std::equal_to<sal_Int32>(),0)) ,m_pKeySet->get().end()); } @@ -1229,7 +1229,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, const Reference<XIndexAccess>& _xNames, bool _bSetColumnMapping, const Reference<XDatabaseMetaData>& _xMetaData, - ::std::vector<sal_Int32>& _rColMapping) + std::vector<sal_Int32>& _rColMapping) { ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers()); @@ -1239,7 +1239,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, const OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); - ::std::vector< OUString> aColumnNames; + std::vector< OUString> aColumnNames; aColumnNames.reserve(_rxColumns->get().size()); OValueVector::Vector::iterator aRowIter = _rRow->get().begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column @@ -1434,7 +1434,7 @@ bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) return true; } -void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping) +void OResultSet::setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; #if OSL_DEBUG_LEVEL > 0 @@ -1747,12 +1747,12 @@ void OResultSet::setTable(OTable* _rTable) m_aColumnNames = m_xTableColumns->getElementNames(); } -void OResultSet::setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy) +void OResultSet::setOrderByColumns(const std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } -void OResultSet::setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrderbyAsc) +void OResultSet::setOrderByAscending(const std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index c8fc79ef5104..6c18cd6dbf33 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -65,8 +65,8 @@ namespace connectivity typedef sal_Int64 TVoidPtr; - typedef ::std::allocator< TVoidPtr > TVoidAlloc; - typedef ::std::vector<TVoidPtr> TVoidVector; + typedef std::allocator< TVoidPtr > TVoidAlloc; + typedef std::vector<TVoidPtr> TVoidVector; class OResultSet : public cppu::BaseMutex, public OResultSet_BASE, @@ -219,13 +219,13 @@ protected: css::uno::Reference< css::container::XNameAccess > m_xTableColumns; - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; - ::std::vector<TAscendingOrder> m_aOrderbyAscending; + std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time + std::vector<sal_Int32> m_aOrderbyColumnNumber; + std::vector<TAscendingOrder> m_aOrderbyAscending; css::uno::Sequence< OUString> m_aColumnNames; OValueRow m_aRow; OValueRow m_aParameterRow; - ::std::vector< OUString> m_aAttributeStrings; + std::vector< OUString> m_aAttributeStrings; sal_Int32 m_nParamIndex; bool m_bIsAlwaysFalseQuery; ::rtl::Reference<OKeySet> m_pKeySet; @@ -295,11 +295,11 @@ public: void setBindingRow(const OValueRow& _aRow) { m_aRow = _aRow; } - void setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping); + void setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping); - void setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy); + void setOrderByColumns(const std::vector<sal_Int32>& _aColumnOrderBy); - void setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrderbyAsc); + void setOrderByAscending(const std::vector<TAscendingOrder>& _aOrderbyAsc); inline sal_Int32 mapColumn(sal_Int32 column); @@ -312,7 +312,7 @@ public: const css::uno::Reference< css::container::XIndexAccess>& _xNames, bool _bSetColumnMapping, const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _xMetaData, - ::std::vector<sal_Int32>& _rColMapping); + std::vector<sal_Int32>& _rColMapping); ::osl::Mutex& getMutex() { return m_aMutex; } void methodEntry(); diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 7f9ed80eb17f..26cb3ba91f5c 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -145,7 +145,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql // set the binding of the resultrow m_aRow = new OValueVector(xNames->getCount()); (m_aRow->get())[0].setBound(true); - ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetBound(false)); + std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetBound(false)); // create the column mapping createColumnMapping(); diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index ec88e19e1199..a7e3c3f39ce6 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -74,9 +74,9 @@ namespace connectivity connectivity::OSQLParseNode* m_pParseTree; - ::std::vector<sal_Int32> m_aColMapping; - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; - ::std::vector<TAscendingOrder> m_aOrderbyAscending; + std::vector<sal_Int32> m_aColMapping; + std::vector<sal_Int32> m_aOrderbyColumnNumber; + std::vector<TAscendingOrder> m_aOrderbyAscending; protected: diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index 8bd1021bf343..7fedd51809a1 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -39,7 +39,7 @@ namespace connectivity class ProfileStruct; } } -typedef ::std::map < OUString, ::connectivity::mozab::ProfileStruct* > ProfileList; +typedef std::map < OUString, ::connectivity::mozab::ProfileStruct* > ProfileList; namespace connectivity { namespace mozab diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index 6d9e1c1b865c..38f0b24e211b 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -124,7 +124,7 @@ Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) { Sequence< Type > aTypes = OCatalog::getTypes(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 128bb6daf9c7..8d1518845816 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -152,7 +152,7 @@ namespace connectivity Sequence< PropertyValue > lcl_convertProperties(T_DRIVERTYPE _eType,const Sequence< PropertyValue >& info,const OUString& _sUrl) { - ::std::vector<PropertyValue> aProps; + std::vector<PropertyValue> aProps; const PropertyValue* pSupported = info.getConstArray(); const PropertyValue* pEnd = pSupported + info.getLength(); @@ -325,7 +325,7 @@ namespace connectivity Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) { - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index eb8d58547650..581f434a2745 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -109,7 +109,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr, sal_Int32 nTi memset(szConnStrOut,'\0',4096); memset(szConnStrIn,'\0',2048); OString aConStr(OUStringToOString(aConnectStr,getTextEncoding())); - memcpy(szConnStrIn, aConStr.getStr(), ::std::min<sal_Int32>((sal_Int32)2048,aConStr.getLength())); + memcpy(szConnStrIn, aConStr.getStr(), std::min<sal_Int32>((sal_Int32)2048,aConStr.getLength())); #ifndef MACOSX N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_LOGIN_TIMEOUT,reinterpret_cast<SQLPOINTER>(nTimeOut),SQL_IS_UINTEGER); @@ -122,7 +122,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr, sal_Int32 nTi nSQLRETURN = N3SQLDriverConnect(m_aConnectionHandle, nullptr, szConnStrIn, - (SQLSMALLINT) ::std::min((sal_Int32)2048,aConStr.getLength()), + (SQLSMALLINT) std::min((sal_Int32)2048,aConStr.getLength()), szConnStrOut, (SQLSMALLINT) (sizeof(szConnStrOut)/sizeof(SDB_ODBC_CHAR)) -1, &cbConnStrOut, @@ -135,7 +135,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr, sal_Int32 nTi nSQLRETURN = N3SQLDriverConnect(m_aConnectionHandle, nullptr, szConnStrIn, - (SQLSMALLINT) ::std::min<sal_Int32>((sal_Int32)2048,aConStr.getLength()), + (SQLSMALLINT) std::min<sal_Int32>((sal_Int32)2048,aConStr.getLength()), szConnStrOut, (SQLSMALLINT) sizeof szConnStrOut, &cbConnStrOut, @@ -480,10 +480,10 @@ void OConnection::disposing() OConnection_BASE::disposing(); - for (::std::map< SQLHANDLE,OConnection*>::iterator aConIter = m_aConnections.begin();aConIter != m_aConnections.end();++aConIter ) + for (std::map< SQLHANDLE,OConnection*>::iterator aConIter = m_aConnections.begin();aConIter != m_aConnections.end();++aConIter ) aConIter->second->dispose(); - ::std::map< SQLHANDLE,OConnection*>().swap(m_aConnections); + std::map< SQLHANDLE,OConnection*>().swap(m_aConnections); if(!m_bClosed) N3SQLDisconnect(m_aConnectionHandle); @@ -516,7 +516,7 @@ SQLHANDLE OConnection::createStatementHandle() N3SQLAllocHandle(SQL_HANDLE_STMT,pConnectionTemp->getConnection(),&aStatementHandle); ++m_nStatementCount; if(bNew) - m_aConnections.insert(::std::map< SQLHANDLE,OConnection*>::value_type(aStatementHandle,pConnectionTemp)); + m_aConnections.insert(std::map< SQLHANDLE,OConnection*>::value_type(aStatementHandle,pConnectionTemp)); return aStatementHandle; @@ -527,7 +527,7 @@ void OConnection::freeStatementHandle(SQLHANDLE& _pHandle) if( SQL_NULL_HANDLE == _pHandle ) return; - ::std::map< SQLHANDLE,OConnection*>::iterator aFind = m_aConnections.find(_pHandle); + std::map< SQLHANDLE,OConnection*>::iterator aFind = m_aConnections.find(_pHandle); N3SQLFreeStmt(_pHandle,SQL_RESET_PARAMS); N3SQLFreeStmt(_pHandle,SQL_UNBIND); diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index bf3254aa2e6f..f0345d5eefd7 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -178,7 +178,7 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get if ( !m_aValueRange.empty() ) { - ::std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter (m_aValueRange.find(columnIndex)); + std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter (m_aValueRange.find(columnIndex)); if ( aValueRangeIter != m_aValueRange.end() ) return static_cast<T>(aValueRangeIter->second[nVal]); } @@ -1288,9 +1288,9 @@ void ODatabaseMetaDataResultSet::checkColumnCount() SWORD ODatabaseMetaDataResultSet::impl_getColumnType_nothrow(sal_Int32 columnIndex) { - ::std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(columnIndex); + std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(columnIndex); if ( aFind == m_aODBCColumnTypes.end() ) - aFind = m_aODBCColumnTypes.insert(::std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pConnection.get(),m_aStatementHandle,*this,columnIndex))).first; + aFind = m_aODBCColumnTypes.insert(std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pConnection.get(),m_aStatementHandle,*this,columnIndex))).first; return aFind->second; } diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index 0a166e6b8424..83b795fbbe4c 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -117,7 +117,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr { if ( acceptsURL(url) ) { - ::std::vector< DriverPropertyInfo > aDriverInfo; + std::vector< DriverPropertyInfo > aDriverInfo; Sequence< OUString > aBooleanValues(2); aBooleanValues[0] = "false"; diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 8404cba5fa54..ca487c78bcef 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -790,7 +790,7 @@ void OPreparedStatement::putParamData (sal_Int32 index) do { - sal_Int32 toReadThisRound = ::std::min( MAX_PUT_DATA_LENGTH, maxBytesLeft ); + sal_Int32 toReadThisRound = std::min( MAX_PUT_DATA_LENGTH, maxBytesLeft ); // Read some data from the input stream haveRead = inputStream->readBytes( buf, toReadThisRound ); diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 9b9acd0681f2..8878a6a60b58 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -1157,7 +1157,7 @@ Sequence<sal_Int8> OResultSet::impl_getBookmark( ) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - TBookmarkPosMap::const_iterator aFind = ::std::find_if(m_aPosToBookmarks.begin(),m_aPosToBookmarks.end(), + TBookmarkPosMap::const_iterator aFind = std::find_if(m_aPosToBookmarks.begin(),m_aPosToBookmarks.end(), [this] (const TBookmarkPosMap::value_type& bookmarkPos) { return bookmarkPos.second == m_nRowPos; }); @@ -1818,9 +1818,9 @@ void OResultSet::fillNeededData(SQLRETURN _nRet) SWORD OResultSet::impl_getColumnType_nothrow(sal_Int32 columnIndex) { - ::std::map<sal_Int32,SWORD>::const_iterator aFind = m_aODBCColumnTypes.find(columnIndex); + std::map<sal_Int32,SWORD>::const_iterator aFind = m_aODBCColumnTypes.find(columnIndex); if ( aFind == m_aODBCColumnTypes.end() ) - aFind = m_aODBCColumnTypes.insert(::std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex))).first; + aFind = m_aODBCColumnTypes.insert(std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex))).first; return aFind->second; } diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx index 087e94973518..aff770cbced5 100644 --- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx @@ -129,7 +129,7 @@ SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) { - ::std::map<sal_Int32,sal_Int32>::iterator aFind = m_aColumnTypes.find(column); + std::map<sal_Int32,sal_Int32>::iterator aFind = m_aColumnTypes.find(column); if ( aFind == m_aColumnTypes.end() ) { sal_Int32 nType = 0; @@ -150,7 +150,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) } else nType = OTools::MapOdbcType2Jdbc(getNumColAttrib(column,SQL_DESC_CONCISE_TYPE )); - aFind = m_aColumnTypes.insert(::std::map<sal_Int32,sal_Int32>::value_type(column,nType)).first; + aFind = m_aColumnTypes.insert(std::map<sal_Int32,sal_Int32>::value_type(column,nType)).first; } diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index ea21207d3e61..834984027a74 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -139,7 +139,7 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) Sequence< Type > aOldTypes = OStatement_BASE::getTypes(); if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() ) { - ::std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(), + std::remove(aOldTypes.getArray(),aOldTypes.getArray() + aOldTypes.getLength(), cppu::UnoType<XGeneratedResultSet>::get()); aOldTypes.realloc(aOldTypes.getLength() - 1); } @@ -485,7 +485,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) OString aBatchSql; sal_Int32 nLen = 0; - for(::std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) + for(std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen) { aBatchSql += OUStringToOString(*i,getOwnConnection()->getTextEncoding()); aBatchSql += ";"; diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index eea45df983e2..a9c72a4449aa 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -196,9 +196,9 @@ Connection::~Connection() m_settings.logFile = nullptr; } } -typedef ::std::list< css::uno::Reference< css::sdbc::XCloseable > > CloseableList; +typedef std::list< css::uno::Reference< css::sdbc::XCloseable > > CloseableList; -typedef ::std::list< css::uno::Reference< css::lang::XComponent > > DisposeableList; +typedef std::list< css::uno::Reference< css::lang::XComponent > > DisposeableList; void Connection::close() { diff --git a/connectivity/source/drivers/postgresql/pq_connection.hxx b/connectivity/source/drivers/postgresql/pq_connection.hxx index 85f2a7e50f24..06bc37e0cb12 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.hxx +++ b/connectivity/source/drivers/postgresql/pq_connection.hxx @@ -146,7 +146,7 @@ typedef std::unordered_map< ::rtl::ByteSequence, css::uno::WeakReference< css::sdbc::XCloseable >, HashByteSequence > WeakHashMap; -typedef ::std::vector< OString > OStringVector; +typedef std::vector< OString > OStringVector; typedef std::unordered_map diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx index a1e5f5d44033..2d0e55823f6f 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.hxx @@ -58,7 +58,7 @@ struct UpdateableField bool isTouched; }; -typedef ::std::vector< UpdateableField > UpdateableFieldVector; +typedef std::vector< UpdateableField > UpdateableFieldVector; class UpdateableResultSet : public SequenceResultSet, diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index e714f6d63a7f..9e8eea7bb9cd 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -37,8 +37,8 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; - ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; + std::map<sal_Int32,connectivity::OColumn> m_mColumns; + std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; protected: virtual ~ODatabaseMetaDataResultSetMetaData() override; diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index 596a960ddfef..b8841927addc 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -40,21 +40,21 @@ namespace connectivity ::connectivity::ODatabaseMetaDataResultSet::ORows m_aTypeInfoRows; // cached database information - ::std::pair<bool,bool> m_isCatalogAtStart; - ::std::pair<bool,OUString> m_sCatalogSeparator; - ::std::pair<bool,OUString> m_sIdentifierQuoteString; - ::std::pair<bool,bool> m_supportsCatalogsInTableDefinitions; - ::std::pair<bool,bool> m_supportsSchemasInTableDefinitions; - ::std::pair<bool,bool> m_supportsCatalogsInDataManipulation; - ::std::pair<bool,bool> m_supportsSchemasInDataManipulation; - ::std::pair<bool,bool> m_supportsMixedCaseQuotedIdentifiers; - ::std::pair<bool,bool> m_supportsAlterTableWithAddColumn; - ::std::pair<bool,bool> m_supportsAlterTableWithDropColumn; - ::std::pair<bool,sal_Int32> m_MaxStatements; - ::std::pair<bool,sal_Int32> m_MaxTablesInSelect; - ::std::pair<bool,bool> m_storesMixedCaseQuotedIdentifiers; + std::pair<bool,bool> m_isCatalogAtStart; + std::pair<bool,OUString> m_sCatalogSeparator; + std::pair<bool,OUString> m_sIdentifierQuoteString; + std::pair<bool,bool> m_supportsCatalogsInTableDefinitions; + std::pair<bool,bool> m_supportsSchemasInTableDefinitions; + std::pair<bool,bool> m_supportsCatalogsInDataManipulation; + std::pair<bool,bool> m_supportsSchemasInDataManipulation; + std::pair<bool,bool> m_supportsMixedCaseQuotedIdentifiers; + std::pair<bool,bool> m_supportsAlterTableWithAddColumn; + std::pair<bool,bool> m_supportsAlterTableWithDropColumn; + std::pair<bool,sal_Int32> m_MaxStatements; + std::pair<bool,sal_Int32> m_MaxTablesInSelect; + std::pair<bool,bool> m_storesMixedCaseQuotedIdentifiers; - template <typename T> T callImplMethod(::std::pair<bool,T>& _rCache,const ::std::mem_fun_t<T,ODatabaseMetaDataBase>& _pImplMethod) + template <typename T> T callImplMethod(std::pair<bool,T>& _rCache,const std::mem_fun_t<T,ODatabaseMetaDataBase>& _pImplMethod) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !_rCache.first ) diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index e308b91a278d..6d7f1b336d5f 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -27,7 +27,7 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OKeyValue { private: - ::std::vector<ORowSetValueDecoratorRef> m_aKeys; + std::vector<ORowSetValueDecoratorRef> m_aKeys; sal_Int32 m_nValue; protected: @@ -53,12 +53,12 @@ namespace connectivity m_aKeys.push_back(_aValueRef); } - OUString getKeyString(::std::vector<ORowSetValueDecoratorRef>::size_type i) const + OUString getKeyString(std::vector<ORowSetValueDecoratorRef>::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); } - double getKeyDouble(::std::vector<ORowSetValueDecoratorRef>::size_type i) const + double getKeyDouble(std::vector<ORowSetValueDecoratorRef>::size_type i) const { OSL_ENSURE(m_aKeys.size() > i,"Wrong index for KEyValue"); return m_aKeys[i]->getValue(); diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index 4b610082756f..6b8231a5d48b 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -32,7 +32,7 @@ namespace connectivity */ class OOO_DLLPUBLIC_DBTOOLS OSkipDeletedSet { - ::std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position + std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position IResultSetHelper* m_pHelper; // used for moving in the resultset bool m_bDeletedVisible; diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 4db3fbd60566..599e8f7209c8 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -39,7 +39,7 @@ namespace connectivity }; class OKeySet; - class OKeyValue; // simple class which holds a sal_Int32 and a ::std::vector<ORowSetValueDecoratorRef> + class OKeyValue; // simple class which holds a sal_Int32 and a std::vector<ORowSetValueDecoratorRef> /** The class OSortIndex can be used to implement a sorted index. @@ -48,19 +48,19 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OSortIndex { public: - typedef ::std::vector< ::std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; - typedef ::std::vector<OKeyType> TKeyTypeVector; + typedef std::vector< std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; + typedef std::vector<OKeyType> TKeyTypeVector; private: TIntValuePairVector m_aKeyValues; TKeyTypeVector m_aKeyType; - ::std::vector<TAscendingOrder> m_aAscending; + std::vector<TAscendingOrder> m_aAscending; bool m_bFrozen; public: - OSortIndex( const ::std::vector<OKeyType>& _aKeyType, - const ::std::vector<TAscendingOrder>& _aAscending); + OSortIndex( const std::vector<OKeyType>& _aKeyType, + const std::vector<TAscendingOrder>& _aAscending); ~OSortIndex(); @@ -93,8 +93,8 @@ namespace connectivity */ ::rtl::Reference<OKeySet> CreateKeySet(); - inline const ::std::vector<OKeyType>& getKeyType() const { return m_aKeyType; } - inline TAscendingOrder getAscending(::std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; } + inline const std::vector<OKeyType>& getKeyType() const { return m_aKeyType; } + inline TAscendingOrder getAscending(std::vector<TAscendingOrder>::size_type _nPos) const { return m_aAscending[_nPos]; } }; diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 74d6bd7750f3..0ac1470fa1aa 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -44,7 +44,7 @@ namespace connectivity class WpADOConnection; class ODriver; class OCatalog; - typedef ::std::multimap<DataTypeEnum, OExtendedTypeInfo*> OTypeInfoMap; + typedef std::multimap<DataTypeEnum, OExtendedTypeInfo*> OTypeInfoMap; typedef connectivity::OMetaConnection OConnection_BASE; diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx index 5f3f7d616956..e8ebb65b844b 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx @@ -42,7 +42,7 @@ namespace connectivity bool fSupported; }; - ::std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; + std::map<sal_uInt32,LiteralInfo> m_aLiteralInfo; WpADOConnection* m_pADOConnection; OConnection* m_pConnection; diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 234e986b85c0..8883600ee6d2 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -55,16 +55,16 @@ namespace connectivity public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> { - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time + std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::map<sal_Int32, TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter; + std::map<sal_Int32, TInt2IntMap > m_aValueRange; + std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter; - ::std::map<sal_Int32, ::std::map< OUString,sal_Int32> > m_aStrValueRange; - ::std::map<sal_Int32, ::std::map< OUString,sal_Int32> >::iterator m_aStrValueRangeIter; + std::map<sal_Int32, std::map< OUString,sal_Int32> > m_aStrValueRange; + std::map<sal_Int32, std::map< OUString,sal_Int32> >::iterator m_aStrValueRangeIter; - ::std::map<sal_Int32, ::std::map< sal_Int32,OUString> > m_aIntValueRange; - ::std::map<sal_Int32, ::std::map< sal_Int32,OUString> >::iterator m_aIntValueRangeIter; + std::map<sal_Int32, std::map< sal_Int32,OUString> > m_aIntValueRange; + std::map<sal_Int32, std::map< sal_Int32,OUString> >::iterator m_aIntValueRangeIter; ADORecordset* m_pRecordSet; css::uno::WeakReferenceHelper m_aStatement; @@ -193,7 +193,7 @@ namespace connectivity // XColumnLocate virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; - const ::std::vector<sal_Int32>& getColumnMapping() { return m_aColMapping; } + const std::vector<sal_Int32>& getColumnMapping() { return m_aColMapping; } void setCatalogsMap(); void setSchemasMap(); diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx index cfe57f924f98..db3e9808200a 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx @@ -40,9 +40,9 @@ namespace connectivity { friend class ODatabaseMetaDataResultSet; - const ::std::vector<sal_Int32> &m_vMapping; // when not every column is needed - ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; - ::std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; + const std::vector<sal_Int32> &m_vMapping; // when not every column is needed + std::map<sal_Int32,connectivity::OColumn> m_mColumns; + std::map<sal_Int32,connectivity::OColumn>::const_iterator m_mColumnsIter; ADORecordset* m_pRecordSet; sal_Int32 m_nColCount; diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx index 111e45885cb6..fab79415258b 100644 --- a/connectivity/source/inc/ado/AResultSet.hxx +++ b/connectivity/source/inc/ado/AResultSet.hxx @@ -67,7 +67,7 @@ namespace connectivity OStatement_Base* m_pStmt; css::uno::Reference< css::uno::XInterface> m_xStatement; css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData; - ::std::vector<OLEVariant> m_aBookmarks; + std::vector<OLEVariant> m_aBookmarks; OLEVariant m_aValue; ADO_LONGPTR m_nRowPos; bool m_bEOF; diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx index e0c31099344f..bf16e48dff04 100644 --- a/connectivity/source/inc/ado/AStatement.hxx +++ b/connectivity/source/inc/ado/AStatement.hxx @@ -62,7 +62,7 @@ namespace connectivity css::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< OUString> m_aBatchList; + std::list< OUString> m_aBatchList; css::uno::WeakReference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created // for this Statement @@ -72,7 +72,7 @@ namespace connectivity WpADORecordset m_RecordSet; OLEVariant m_RecordsAffected; OLEVariant m_Parameters; - ::std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry + std::vector<connectivity::OTypeInfo> m_aTypeInfo; // Hashtable containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. ADO_LONGPTR m_nMaxRows; diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index 717b298d58f3..c00d09cf22e5 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -42,9 +42,9 @@ namespace connectivity class OCalcTable : public OCalcTable_BASE { private: - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth - ::std::vector<sal_Int32> m_aScales; + std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + std::vector<sal_Int32> m_aPrecisions; // same as aboth + std::vector<sal_Int32> m_aScales; css::uno::Reference< css::sheet::XSpreadsheet > m_xSheet; OCalcConnection* m_pConnection; sal_Int32 m_nStartCol; diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 72155a9685fb..5bfe40272db9 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -85,10 +85,10 @@ namespace connectivity } }; - ::std::vector<sal_Int32> m_aTypes; // holds all types for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as above - ::std::vector<sal_Int32> m_aScales; - ::std::vector<sal_Int32> m_aRealFieldLengths; + std::vector<sal_Int32> m_aTypes; // holds all types for columns just to avoid to ask the propertyset + std::vector<sal_Int32> m_aPrecisions; // same as above + std::vector<sal_Int32> m_aScales; + std::vector<sal_Int32> m_aRealFieldLengths; DBFHeader m_aHeader; DBFMemoHeader m_aMemoHeader; SvStream* m_pMemoStream; diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 4e19f19f0f91..00c359cbfad6 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -229,7 +229,7 @@ namespace connectivity SvStream& WriteONDXPage(SvStream &rStream, const ONDXPage& rPage); - typedef ::std::vector<ONDXPage*> ONDXPageList; + typedef std::vector<ONDXPage*> ONDXPageList; // Index Node diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx index 0d8d53b22c06..76d934b38342 100644 --- a/connectivity/source/inc/file/FDateFunctions.hxx +++ b/connectivity/source/inc/file/FDateFunctions.hxx @@ -137,7 +137,7 @@ namespace connectivity class OOp_Week : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** YEAR(date) @@ -199,7 +199,7 @@ namespace connectivity class OOp_CurDate : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** CURTIME() @@ -212,7 +212,7 @@ namespace connectivity class OOp_CurTime : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** NOW() @@ -224,7 +224,7 @@ namespace connectivity class OOp_Now : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; } } diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx index f71885170979..79592c14b012 100644 --- a/connectivity/source/inc/file/FNumericFunctions.hxx +++ b/connectivity/source/inc/file/FNumericFunctions.hxx @@ -128,7 +128,7 @@ namespace connectivity class OOp_Round : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** EXP(X) @@ -179,7 +179,7 @@ namespace connectivity class OOp_Log : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** LOG10(X) @@ -238,7 +238,7 @@ namespace connectivity class OOp_Pi : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** COS(X) diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index e9511207207e..6441202ded24 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -60,7 +60,7 @@ namespace connectivity sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, const css::uno::Reference< css::beans::XPropertySet>& _xCol); - void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); + void scanParameter(OSQLParseNode* pParseNode,std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); void describeParameter(); diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 503198ac46dd..7044200286fe 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -69,10 +69,10 @@ namespace connectivity { protected: - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time + std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; - ::std::vector<TAscendingOrder> m_aOrderbyAscending; + std::vector<sal_Int32> m_aOrderbyColumnNumber; + std::vector<TAscendingOrder> m_aOrderbyAscending; OValueRefRow m_aSelectRow; OValueRefRow m_aRow; @@ -274,11 +274,11 @@ namespace connectivity m_aSelectRow = _rRow; m_nColumnCount = m_aSelectRow->get().size(); } - inline void setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } + inline void setColumnMapping(const std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; } inline void setSqlAnalyzer(OSQLAnalyzer* _pSQLAnalyzer) { m_pSQLAnalyzer = _pSQLAnalyzer; } - inline void setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } - inline void setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } + inline void setOrderByColumns(const std::vector<sal_Int32>& _aColumnOrderBy) { m_aOrderbyColumnNumber = _aColumnOrderBy; } + inline void setOrderByAscending(const std::vector<TAscendingOrder>& _aOrderbyAsc) { m_aOrderbyAscending = _aOrderbyAsc; } inline void setMetaData(const css::uno::Reference< css::sdbc::XResultSetMetaData>& _xMetaData) { m_xMetaData = _xMetaData;} static void setBoundedColumns(const OValueRefRow& _rRow, @@ -287,7 +287,7 @@ namespace connectivity const css::uno::Reference< css::container::XIndexAccess>& _xNames, bool _bSetColumnMapping, const css::uno::Reference< css::sdbc::XDatabaseMetaData>& _xMetaData, - ::std::vector<sal_Int32>& _rColMapping); + std::vector<sal_Int32>& _rColMapping); // IResultSetHelper virtual bool move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, bool _bRetrieveData) override; diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index cd2a5c8defcb..baa9cf74f437 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -62,10 +62,10 @@ namespace connectivity { protected: - ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::vector<sal_Int32> m_aParameterIndexes; // maps the parameter index to column index - ::std::vector<sal_Int32> m_aOrderbyColumnNumber; - ::std::vector<TAscendingOrder> m_aOrderbyAscending; + std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time + std::vector<sal_Int32> m_aParameterIndexes; // maps the parameter index to column index + std::vector<sal_Int32> m_aOrderbyColumnNumber; + std::vector<TAscendingOrder> m_aOrderbyAscending; css::sdbc::SQLWarning m_aLastWarning; css::uno::WeakReference< css::sdbc::XResultSet> m_xResultSet; // The last ResultSet created @@ -117,7 +117,7 @@ namespace connectivity const OUString& aValue, bool bSetNull = false, sal_uInt32 nParameter=SQL_NO_PARAMETER); - void ParseAssignValues( const ::std::vector< OUString>& aColumnNameList, + void ParseAssignValues( const std::vector< OUString>& aColumnNameList, connectivity::OSQLParseNode* pRow_Value_Constructor_Elem, sal_Int32 nIndex); virtual void parseParamterElem(const OUString& _sColumnName,OSQLParseNode* pRow_Value_Constructor_Elem); diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx index 232d438c5d3f..b184787f4322 100644 --- a/connectivity/source/inc/file/FStringFunctions.hxx +++ b/connectivity/source/inc/file/FStringFunctions.hxx @@ -102,7 +102,7 @@ namespace connectivity class OOp_Char : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** CONCAT(str1,str2,...) @@ -119,7 +119,7 @@ namespace connectivity class OOp_Concat : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** LOCATE(substr,str) @@ -140,7 +140,7 @@ namespace connectivity class OOp_Locate : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** SUBSTRING(str,pos) @@ -162,7 +162,7 @@ namespace connectivity class OOp_SubString : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** LTRIM(str) @@ -214,7 +214,7 @@ namespace connectivity class OOp_Replace : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** REPEAT(str,count) @@ -240,7 +240,7 @@ namespace connectivity class OOp_Insert : public ONthOperator { protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const override; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const override; }; /** LEFT(str,len) diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 0188f623c7ea..919f31df66bd 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -30,9 +30,9 @@ namespace connectivity class OConnection; class OOO_DLLPUBLIC_FILE OSQLAnalyzer final { - typedef ::std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates; + typedef std::pair< ::rtl::Reference<OPredicateCompiler>,::rtl::Reference<OPredicateInterpreter> > TPredicates; - ::std::vector< TPredicates > m_aSelectionEvaluations; + std::vector< TPredicates > m_aSelectionEvaluations; ::rtl::Reference<OPredicateCompiler> m_aCompiler; ::rtl::Reference<OPredicateInterpreter> m_aInterpreter; OConnection* m_pConnection; @@ -73,7 +73,7 @@ namespace connectivity bool hasRestriction() const; bool hasFunctions() const; inline bool evaluateRestriction() { return m_aInterpreter->start(); } - void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping); + void setSelectionEvaluationResult(OValueRefRow& _pRow,const std::vector<sal_Int32>& _rColumnMapping); void setOrigColumns(const css::uno::Reference< css::container::XNameAccess>& rCols); static OOperandAttr* createOperandAttr(sal_Int32 _nPos, const css::uno::Reference< css::beans::XPropertySet>& _xCol, diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 191d3d24e166..14d66831bd93 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -37,7 +37,7 @@ namespace connectivity { class OOperand; - typedef ::std::stack<OOperand*> OCodeStack; + typedef std::stack<OOperand*> OCodeStack; class OOO_DLLPUBLIC_FILE OCode { @@ -321,7 +321,7 @@ namespace connectivity protected: - virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const = 0; + virtual ORowSetValue operate(const std::vector<ORowSetValue>& lhs) const = 0; }; class OBinaryOperator : public OOperator diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index a774b2f3c6f5..aa04fb54e1bd 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -31,7 +31,7 @@ namespace connectivity class OCode; class OOperand; class OSQLAnalyzer; - typedef::std::vector<OCode*> OCodeList; + typedef std::vector<OCode*> OCodeList; class OPredicateCompiler : public ::salhelper::SimpleReferenceObject { diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index 4b3bf72e6383..fbeff5c3ccd0 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -35,18 +35,18 @@ namespace connectivity typedef file::OFileTable OFlatTable_BASE; class OFlatConnection; - typedef ::std::pair<sal_Int32, sal_Int32> TRowPositionInFile; + typedef std::pair<sal_Int32, sal_Int32> TRowPositionInFile; class OFlatTable : public OFlatTable_BASE { // maps a row position to a file position // row n is positions [m_aRowPosToFilePos[n]->first, m_aRowPosToFilePos[n]->second) in file // "real" row indexes start at 1; for the purposes of m_aRowPosToFilePos, row 0 is headers - ::std::vector<TRowPositionInFile> + std::vector<TRowPositionInFile> m_aRowPosToFilePos; - ::std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - ::std::vector<sal_Int32> m_aPrecisions; // same as aboth - ::std::vector<sal_Int32> m_aScales; + std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + std::vector<sal_Int32> m_aPrecisions; // same as aboth + std::vector<sal_Int32> m_aScales; QuotedTokenizedString m_aCurrentLine; css::uno::Reference< css::util::XNumberFormatter > m_xNumberFormatter; css::util::Date m_aNullDate; @@ -58,7 +58,7 @@ namespace connectivity private: void fillColumns(const css::lang::Locale& _aLocale); bool readLine(sal_Int32 *pEndPos, sal_Int32 *pStartPos, bool nonEmpty = false); - void setRowPos(::std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos); + void setRowPos(std::vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos); void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine, sal_Int32& nStartPosFirstLine, sal_Int32& nStartPosFirstLine2, sal_Int32& io_nType, sal_Int32& io_nPrecisions, sal_Int32& io_nScales, OUString& o_sTypeName, const sal_Unicode cDecimalDelimiter, const sal_Unicode cThousandDelimiter, const CharClass& aCharClass); diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index d070347b15d1..6a9957c1499b 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -48,11 +48,11 @@ namespace connectivity , css::embed::XTransactionListener > ODriverDelegator_BASE; - typedef ::std::pair< css::uno::WeakReferenceHelper,css::uno::WeakReferenceHelper> TWeakRefPair; - typedef ::std::pair< OUString ,TWeakRefPair > TWeakConnectionPair; + typedef std::pair< css::uno::WeakReferenceHelper,css::uno::WeakReferenceHelper> TWeakRefPair; + typedef std::pair< OUString ,TWeakRefPair > TWeakConnectionPair; - typedef ::std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; - typedef ::std::vector< TWeakPair > TWeakPairVector; + typedef std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; + typedef std::vector< TWeakPair > TWeakPairVector; /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 29667d0958db..159ed9931d10 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -50,9 +50,9 @@ namespace connectivity , css::lang::XServiceInfo > ODriverDelegator_BASE; - typedef ::std::pair< css::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair; - typedef ::std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; - typedef ::std::vector< TWeakPair > TWeakPairVector; + typedef std::pair< css::uno::WeakReferenceHelper,OMetaConnection*> TWeakConnectionPair; + typedef std::pair< css::uno::WeakReferenceHelper,TWeakConnectionPair> TWeakPair; + typedef std::vector< TWeakPair > TWeakPairVector; typedef std::map< OUString, css::uno::Reference< css::sdbc::XDriver > > TJDBCDrivers; /** delegates all calls to the orignal driver and extend the existing one with the SDBCX layer. diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index c5269d249067..73610e45afdc 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -42,7 +42,7 @@ namespace connectivity class ODBCDriver; typedef connectivity::OMetaConnection OConnection_BASE; - typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; + typedef std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; class OOO_DLLPUBLIC_ODBCBASE OConnection : public OConnection_BASE, @@ -55,7 +55,7 @@ namespace connectivity // Data attributes - ::std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connections which are need for serveral statements + std::map< SQLHANDLE,OConnection*> m_aConnections; // holds all connections which are need for serveral statements OUString m_sUser; // the user name diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 80fdfcabf7ef..6f83876e8ae8 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -63,10 +63,10 @@ namespace connectivity { ::connectivity::TIntVector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - ::std::map<sal_Int32, ::connectivity::TInt2IntMap > + std::map<sal_Int32, ::connectivity::TInt2IntMap > m_aValueRange; - ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; + std::map<sal_Int32,SWORD> m_aODBCColumnTypes; SQLHANDLE m_aStatementHandle; // ... until freed css::uno::WeakReferenceHelper m_aStatement; diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 0a738d888596..9b79a07b84a2 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -63,11 +63,11 @@ namespace connectivity css::lang::XServiceInfo> OResultSet_BASE; - typedef ::std::pair<sal_Int64,sal_Int32> TVoidPtr; - typedef ::std::allocator< TVoidPtr > TVoidAlloc; - typedef ::std::vector<TVoidPtr> TVoidVector; + typedef std::pair<sal_Int64,sal_Int32> TVoidPtr; + typedef std::allocator< TVoidPtr > TVoidAlloc; + typedef std::vector<TVoidPtr> TVoidVector; /// unary_function Functor object for class ZZ returntype is void - struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : ::std::binary_function< css::uno::Sequence<sal_Int8>, css::uno::Sequence<sal_Int8>, bool > + struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : std::binary_function< css::uno::Sequence<sal_Int8>, css::uno::Sequence<sal_Int8>, bool > { inline bool operator()( const css::uno::Sequence<sal_Int8>& _rLH, const css::uno::Sequence<sal_Int8>& _rRH) const @@ -102,7 +102,7 @@ namespace connectivity } }; - typedef ::std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap; + typedef std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap; class OOO_DLLPUBLIC_ODBCBASE OResultSet : public cppu::BaseMutex, @@ -114,11 +114,11 @@ namespace connectivity protected: TBookmarkPosMap m_aPosToBookmarks; // used top hold the information about the value and the datatype to save calls to metadata - typedef ::std::vector<ORowSetValue> TDataRow; + typedef std::vector<ORowSetValue> TDataRow; TVoidVector m_aBindVector; - ::std::vector<SQLLEN> m_aLengthVector; - ::std::map<sal_Int32,SWORD> m_aODBCColumnTypes; + std::vector<SQLLEN> m_aLengthVector; + std::map<sal_Int32,SWORD> m_aODBCColumnTypes; // In baseline ODBC, SQLGetData can only be called on monotonically increasing column numbers. // additionally, any variable-length data can be fetched only once (possibly in parts); diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index 388c7dded180..e9357c9015c0 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -40,8 +40,8 @@ namespace connectivity public OResultSetMetaData_BASE { protected: - ::std::vector<sal_Int32> m_vMapping; // when not every column is needed - ::std::map<sal_Int32,sal_Int32> m_aColumnTypes; + std::vector<sal_Int32> m_vMapping; // when not every column is needed + std::map<sal_Int32,sal_Int32> m_aColumnTypes; SQLHANDLE m_aStatementHandle; OConnection* m_pConnection; @@ -62,7 +62,7 @@ namespace connectivity ,m_nColCount(-1) ,m_bUseODBC2Types(false) {} - OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const ::std::vector<sal_Int32> & _vMapping) + OResultSetMetaData(OConnection* _pConnection, SQLHANDLE _pStmt ,const std::vector<sal_Int32> & _vMapping) :m_vMapping(_vMapping) ,m_aStatementHandle( _pStmt ) ,m_pConnection(_pConnection) diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 8863d048748d..5f130f948756 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -68,7 +68,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XStatement> m_xGeneratedStatement; // for this Statement - ::std::list< OUString> m_aBatchList; + std::list< OUString> m_aBatchList; OUString m_sSqlStatement; rtl::Reference<OConnection> m_pConnection;// The owning Connection object diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index 409f3c568cdc..538fe88c586e 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.hxx @@ -30,7 +30,7 @@ namespace dbtools { class OOO_DLLPUBLIC_DBTOOLS OPropertyMap { - ::std::map<sal_Int32, OUString> m_aPropertyMap; + std::map<sal_Int32, OUString> m_aPropertyMap; public: OPropertyMap(); const OUString& getNameByIndex(sal_Int32 _nIndex) const; diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index fadbf354822b..f0cbaec43784 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -140,7 +140,7 @@ namespace connectivity the string from the resource file, with applied string substitution */ OUString getResourceStringWithSubstitution( ResourceId _nResId, - const ::std::list< ::std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const; + const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const; }; diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index 228e4b9b1c07..d04527f3530c 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -103,7 +103,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) /// an STL functor which ensures that a SdbcDriver described by a DriverAccess is loaded - struct EnsureDriver : public ::std::unary_function< DriverAccess, DriverAccess > + struct EnsureDriver : public std::unary_function< DriverAccess, DriverAccess > { explicit EnsureDriver( const Reference< XComponentContext > &rxContext ) : mxContext( rxContext ) {} @@ -138,7 +138,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) }; /// an STL functor which extracts a SdbcDriver from a DriverAccess - struct ExtractDriverFromAccess : public ::std::unary_function< DriverAccess, const Reference<XDriver>& > + struct ExtractDriverFromAccess : public std::unary_function< DriverAccess, const Reference<XDriver>& > { const Reference<XDriver>& operator()( const DriverAccess& _rAccess ) const { @@ -146,7 +146,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) } }; - struct ExtractDriverFromCollectionElement : public ::std::unary_function< DriverCollection::value_type, const Reference<XDriver>& > + struct ExtractDriverFromCollectionElement : public std::unary_function< DriverCollection::value_type, const Reference<XDriver>& > { const Reference<XDriver>& operator()( const DriverCollection::value_type& _rElement ) const { @@ -155,7 +155,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) }; // predicate for checking whether or not a driver accepts a given URL - class AcceptsURL : public ::std::unary_function< Reference<XDriver>, bool > + class AcceptsURL : public std::unary_function< Reference<XDriver>, bool > { protected: const OUString& m_rURL; @@ -212,7 +212,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) } /// an STL argorithm compatible predicate comparing two DriverAccess instances by their implementation names - struct CompareDriverAccessByName : public ::std::binary_function< DriverAccess, DriverAccess, bool > + struct CompareDriverAccessByName : public std::binary_function< DriverAccess, DriverAccess, bool > { bool operator()( const DriverAccess& lhs, const DriverAccess& rhs ) @@ -222,7 +222,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) }; /// and STL argorithm compatible predicate comparing a DriverAccess' impl name to a string - struct EqualDriverAccessToName : public ::std::binary_function< DriverAccess, OUString, bool > + struct EqualDriverAccessToName : public std::binary_function< DriverAccess, OUString, bool > { OUString m_sImplName; explicit EqualDriverAccessToName(const OUString& _sImplName) : m_sImplName(_sImplName){} @@ -350,7 +350,7 @@ void OSDBCDriverManager::initializeDriverPrecedence() } // sort our bootstrapped drivers - ::std::sort( m_aDriversBS.begin(), m_aDriversBS.end(), CompareDriverAccessByName() ); + std::sort( m_aDriversBS.begin(), m_aDriversBS.end(), CompareDriverAccessByName() ); // loop through the names in the precedence order const OUString* pDriverOrder = aDriverOrder.getConstArray(); @@ -366,13 +366,13 @@ void OSDBCDriverManager::initializeDriverPrecedence() driver_order.sImplementationName = *pDriverOrder; // look for the impl name in the DriverAccess array - ::std::pair< DriverAccessArray::iterator, DriverAccessArray::iterator > aPos = - ::std::equal_range( aNoPrefDriversStart, m_aDriversBS.end(), driver_order, CompareDriverAccessByName() ); + std::pair< DriverAccessArray::iterator, DriverAccessArray::iterator > aPos = + std::equal_range( aNoPrefDriversStart, m_aDriversBS.end(), driver_order, CompareDriverAccessByName() ); if ( aPos.first != aPos.second ) { // we have a DriverAccess with this impl name - OSL_ENSURE( ::std::distance( aPos.first, aPos.second ) == 1, + OSL_ENSURE( std::distance( aPos.first, aPos.second ) == 1, "OSDBCDriverManager::initializeDriverPrecedence: more than one driver with this impl name? How this?" ); // move the DriverAccess pointed to by aPos.first to the position pointed to by aNoPrefDriversStart @@ -380,7 +380,7 @@ void OSDBCDriverManager::initializeDriverPrecedence() { // if this does not hold, the DriverAccess alread has the correct position // rotate the range [aNoPrefDriversStart, aPos.second) right 1 element - ::std::rotate( aNoPrefDriversStart, aPos.second - 1, aPos.second ); + std::rotate( aNoPrefDriversStart, aPos.second - 1, aPos.second ); } // next round we start searching and pos right @@ -468,21 +468,21 @@ Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration( ) ODriverEnumeration::DriverArray aDrivers; // ensure that all our bootstrapped drivers are instantiated - ::std::for_each( m_aDriversBS.begin(), m_aDriversBS.end(), EnsureDriver( m_xContext ) ); + std::for_each( m_aDriversBS.begin(), m_aDriversBS.end(), EnsureDriver( m_xContext ) ); // copy the bootstrapped drivers - ::std::transform( + std::transform( m_aDriversBS.begin(), // "copy from" start m_aDriversBS.end(), // "copy from" end - ::std::back_inserter( aDrivers ), // insert into + std::back_inserter( aDrivers ), // insert into ExtractDriverFromAccess() // transformation to apply (extract a driver from a driver access) ); // append the runtime drivers - ::std::transform( + std::transform( m_aDriversRT.begin(), // "copy from" start m_aDriversRT.end(), // "copy from" end - ::std::back_inserter( aDrivers ), // insert into + std::back_inserter( aDrivers ), // insert into ExtractDriverFromCollectionElement() // transformation to apply (extract a driver from a driver access) ); @@ -633,11 +633,11 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const OUString& _rU const OUString sDriverFactoryName = m_aDriverConfig.getDriverFactoryName(_rURL); EqualDriverAccessToName aEqual(sDriverFactoryName); - DriverAccessArray::const_iterator aFind = ::std::find_if(m_aDriversBS.begin(),m_aDriversBS.end(),aEqual); + DriverAccessArray::const_iterator aFind = std::find_if(m_aDriversBS.begin(),m_aDriversBS.end(),aEqual); if ( aFind == m_aDriversBS.end() ) { // search all bootstrapped drivers - aFind = ::std::find_if( + aFind = std::find_if( m_aDriversBS.begin(), // begin of search range m_aDriversBS.end(), // end of search range [&_rURL, this] (const DriverAccessArray::value_type& driverAccess) { @@ -661,7 +661,7 @@ Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const OUString& _rU if ( !xReturn.is() ) { // no -> search the runtime drivers - DriverCollection::const_iterator aPos = ::std::find_if( + DriverCollection::const_iterator aPos = std::find_if( m_aDriversRT.begin(), // begin of search range m_aDriversRT.end(), // end of search range [&_rURL] (const DriverCollection::value_type& element) { diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 18e53246187f..1cffcd3d0f55 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -58,7 +58,7 @@ namespace connectivity { struct OSQLParseTreeIteratorImpl { - ::std::vector< TNodePair > m_aJoinConditions; + std::vector< TNodePair > m_aJoinConditions; Reference< XConnection > m_xConnection; Reference< XDatabaseMetaData > m_xDatabaseMetaData; Reference< XNameAccess > m_xTableContainer; @@ -342,8 +342,8 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu } while ( false ); // copy the parameters of the sub query to our own parameter array - ::std::copy( pSubQueryParameterColumns->get().begin(), pSubQueryParameterColumns->get().end(), - ::std::insert_iterator< OSQLColumns::Vector >( m_aParameters->get(), m_aParameters->get().end() ) ); + std::copy( pSubQueryParameterColumns->get().begin(), pSubQueryParameterColumns->get().end(), + std::insert_iterator< OSQLColumns::Vector >( m_aParameters->get(), m_aParameters->get().end() ) ); } @@ -488,7 +488,7 @@ void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoin } } -::std::vector< TNodePair >& OSQLParseTreeIterator::getJoinConditions() const +std::vector< TNodePair >& OSQLParseTreeIterator::getJoinConditions() const { return m_pImpl->m_aJoinConditions; } diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 1c237ad4fbee..6ab4a2f0eddb 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -708,7 +708,7 @@ void OSQLParseNode::impl_parseTableRangeNodeToString_throw(OUStringBuffer& rStri OSL_PRECOND( ( count() == 2 ) || ( count() == 3 ) || ( count() == 5 ) ,"Illegal count"); // rString += " "; - ::std::for_each(m_aChildren.begin(),m_aChildren.end(), + std::for_each(m_aChildren.begin(),m_aChildren.end(), [&] (OSQLParseNode *const pNode) { pNode->impl_parseNodeToString_throw(rString, rParam, false); }); } @@ -1684,7 +1684,7 @@ void OSQLParseNode::append(OSQLParseNode* pNewNode) { OSL_ENSURE(pNewNode != nullptr, "OSQLParseNode: invalid NewSubTree"); OSL_ENSURE(pNewNode->getParent() == nullptr, "OSQLParseNode: Node is not an orphan"); - OSL_ENSURE(::std::find(m_aChildren.begin(), m_aChildren.end(), pNewNode) == m_aChildren.end(), + OSL_ENSURE(std::find(m_aChildren.begin(), m_aChildren.end(), pNewNode) == m_aChildren.end(), "OSQLParseNode::append() Node already element of parent"); // Create connection to getParent @@ -2404,14 +2404,14 @@ OSQLParseNode* OSQLParseNode::replace (OSQLParseNode* pOldSubNode, OSQLParseNode { OSL_ENSURE(pOldSubNode != nullptr && pNewSubNode != nullptr, "OSQLParseNode: invalid nodes"); OSL_ENSURE(pNewSubNode->getParent() == nullptr, "OSQLParseNode: node already has getParent"); - OSL_ENSURE(::std::find(m_aChildren.begin(), m_aChildren.end(), pOldSubNode) != m_aChildren.end(), + OSL_ENSURE(std::find(m_aChildren.begin(), m_aChildren.end(), pOldSubNode) != m_aChildren.end(), "OSQLParseNode::Replace() Node not element of parent"); - OSL_ENSURE(::std::find(m_aChildren.begin(), m_aChildren.end(), pNewSubNode) == m_aChildren.end(), + OSL_ENSURE(std::find(m_aChildren.begin(), m_aChildren.end(), pNewSubNode) == m_aChildren.end(), "OSQLParseNode::Replace() Node already element of parent"); pOldSubNode->setParent( nullptr ); pNewSubNode->setParent( this ); - ::std::replace(m_aChildren.begin(), m_aChildren.end(), pOldSubNode, pNewSubNode); + std::replace(m_aChildren.begin(), m_aChildren.end(), pOldSubNode, pNewSubNode); return pOldSubNode; } @@ -2759,7 +2759,7 @@ void OSQLParseNodesContainer::erase(OSQLParseNode* _pNode) ::osl::MutexGuard aGuard(m_aMutex); if ( !m_aNodes.empty() ) { - ::std::vector< OSQLParseNode* >::iterator aFind = ::std::find(m_aNodes.begin(), m_aNodes.end(),_pNode); + std::vector< OSQLParseNode* >::iterator aFind = std::find(m_aNodes.begin(), m_aNodes.end(),_pNode); if ( aFind != m_aNodes.end() ) m_aNodes.erase(aFind); } diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index f92d87a085a7..40ea6bd89dd7 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -43,7 +43,7 @@ namespace connectivity static oslInterlockedCount s_nClients; private: - ::std::unique_ptr< ::comphelper::OfficeResourceBundle > + std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResourceBundle; public: @@ -194,11 +194,11 @@ namespace connectivity } OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId, - const ::std::list< ::std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const + const std::list< std::pair<const sal_Char* , OUString > >& _rStringToSubstitutes) const { OUString sString( SharedResources_Impl::getInstance().getResourceString( _nResId ) ); - ::std::list< ::std::pair<const sal_Char* , OUString > >::const_iterator aIter = _rStringToSubstitutes.begin(); - ::std::list< ::std::pair<const sal_Char* , OUString > >::const_iterator aEnd = _rStringToSubstitutes.end(); + std::list< std::pair<const sal_Char* , OUString > >::const_iterator aIter = _rStringToSubstitutes.begin(); + std::list< std::pair<const sal_Char* , OUString > >::const_iterator aEnd = _rStringToSubstitutes.end(); for(;aIter != aEnd; ++aIter) OSL_VERIFY( lcl_substitute( sString, aIter->first, aIter->second ) ); diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 7c8e8cbd1ed5..8cf535c40cd3 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -48,13 +48,13 @@ namespace { template < typename T> class OHardRefMap : public connectivity::sdbcx::IObjectCollection { - typedef ::std::multimap< OUString, T , ::comphelper::UStringMixLess> ObjectMap; + typedef std::multimap< OUString, T , ::comphelper::UStringMixLess> ObjectMap; typedef typename ObjectMap::iterator ObjectIter; typedef typename ObjectMap::value_type ObjectEntry; // private: // this combination of map and vector is used to have a fast name and index access - ::std::vector< ObjectIter > m_aElements; // hold the iterators which point to map + std::vector< ObjectIter > m_aElements; // hold the iterators which point to map ObjectMap m_aNameMap; // hold the elements and a name public: OHardRefMap(bool _bCase) @@ -74,13 +74,13 @@ namespace virtual void swapAll() override { - ::std::vector< ObjectIter >(m_aElements).swap(m_aElements); + std::vector< ObjectIter >(m_aElements).swap(m_aElements); ObjectMap(m_aNameMap).swap(m_aNameMap); } virtual void swap() override { - ::std::vector< ObjectIter >().swap(m_aElements); + std::vector< ObjectIter >().swap(m_aElements); OSL_ENSURE( m_aNameMap.empty(), "swap: what did disposeElements do?" ); ObjectMap( m_aNameMap ).swap( m_aNameMap ); @@ -117,7 +117,7 @@ namespace ObjectIter aIter = m_aNameMap.find(_sOldName); if ( aIter != m_aNameMap.end() ) { - typename ::std::vector< ObjectIter >::iterator aFind = ::std::find(m_aElements.begin(),m_aElements.end(),aIter); + typename std::vector< ObjectIter >::iterator aFind = std::find(m_aElements.begin(),m_aElements.end(),aIter); if(m_aElements.end() != aFind) { (*aFind) = m_aNameMap.insert(m_aNameMap.begin(), ObjectEntry(_sNewName,(*aFind)->second)); @@ -139,8 +139,8 @@ namespace Sequence< OUString > aNameList(m_aElements.size()); OUString* pStringArray = aNameList.getArray(); - typename ::std::vector< ObjectIter >::const_iterator aEnd = m_aElements.end(); - for(typename ::std::vector< ObjectIter >::const_iterator aIter = m_aElements.begin(); aIter != aEnd;++aIter,++pStringArray) + typename std::vector< ObjectIter >::const_iterator aEnd = m_aElements.end(); + for(typename std::vector< ObjectIter >::const_iterator aIter = m_aElements.begin(); aIter != aEnd;++aIter,++pStringArray) *pStringArray = (*aIter)->first; return aNameList; @@ -182,7 +182,7 @@ namespace { ObjectIter aIter = m_aNameMap.find(columnName); OSL_ENSURE(aIter != m_aNameMap.end(),"findColumn:: Illegal name!"); - return m_aElements.size() - (m_aElements.end() - ::std::find(m_aElements.begin(),m_aElements.end(),aIter)); + return m_aElements.size() - (m_aElements.end() - std::find(m_aElements.begin(),m_aElements.end(),aIter)); } virtual ObjectType getObject(sal_Int32 _nIndex) override @@ -258,7 +258,7 @@ Sequence< Type > SAL_CALL OCollection::getTypes() Type* pBegin = aTypes.getArray(); Type* pEnd = pBegin + aTypes.getLength(); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); Type aType = cppu::UnoType<XNameAccess>::get(); for(;pBegin != pEnd; ++pBegin) diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index 34516329f731..511bd2e4f21f 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.cxx @@ -64,14 +64,14 @@ namespace connectivity namespace { - struct ResetROAttribute : public ::std::unary_function< Property, void > + struct ResetROAttribute : public std::unary_function< Property, void > { void operator ()( Property& _rProperty ) const { _rProperty.Attributes &= ~PropertyAttribute::READONLY; } }; - struct SetROAttribute : public ::std::unary_function< Property, void > + struct SetROAttribute : public std::unary_function< Property, void > { void operator ()( Property& _rProperty ) const { @@ -87,9 +87,9 @@ namespace connectivity describeProperties( aProperties ); if ( isNew() ) - ::std::for_each( aProperties.getArray(), aProperties.getArray() + aProperties.getLength(), ResetROAttribute() ); + std::for_each( aProperties.getArray(), aProperties.getArray() + aProperties.getLength(), ResetROAttribute() ); else - ::std::for_each( aProperties.getArray(), aProperties.getArray() + aProperties.getLength(), SetROAttribute() ); + std::for_each( aProperties.getArray(), aProperties.getArray() + aProperties.getLength(), SetROAttribute() ); return new ::cppu::OPropertyArrayHelper( aProperties ); } |