diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-17 19:06:24 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-17 18:41:19 +0000 |
| commit | b57d51e32fb85e9cde64f85719725253162c42e4 (patch) | |
| tree | afe75470b9fc3c12a3d240577b07042985882675 /dbaccess | |
| parent | c910d1dae1a9fcf0591098244debc863dd59618a (diff) | |
Drop :: prefix from std in [de]*/
Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4
Reviewed-on: https://gerrit.libreoffice.org/34377
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'dbaccess')
209 files changed, 877 insertions, 877 deletions
diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx index e77ff65c6bc8..6f8e5c6fe1c1 100644 --- a/dbaccess/source/core/api/CIndexes.hxx +++ b/dbaccess/source/core/api/CIndexes.hxx @@ -35,7 +35,7 @@ namespace dbaccess public: OIndexes(connectivity::OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector, + const std::vector< OUString> &_rVector, const css::uno::Reference< css::container::XNameAccess >& _rxIndexes ) : connectivity::OIndexesHelper(_pTable,_rMutex,_rVector) ,m_xIndexes(_rxIndexes) diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index 243dc54969ac..99b15f7d335f 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -198,7 +198,7 @@ ORowSetDataColumns::ORowSetDataColumns( const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector + const std::vector< OUString> &_rVector ) : connectivity::sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aColumns(_rColumns) { @@ -226,7 +226,7 @@ void SAL_CALL ORowSetDataColumns::disposing() m_aColumns = nullptr; } -void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector) +void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const std::vector< OUString> &_rVector) { m_aColumns = _rColumns; reFill(_rVector); diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index a09bc21230fc..2ae7789ac399 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -88,12 +88,12 @@ namespace dbaccess const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector + const std::vector< OUString> &_rVector ); virtual ~ORowSetDataColumns() override; // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; - void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector); + void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const std::vector< OUString> &_rVector); }; } diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index ed1a12a4e8c8..f15c752e6972 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -194,7 +194,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow ,const connectivity::OSQLTable& _xTable ,OUStringBuffer& _sCondition ,OUStringBuffer& _sParameter - ,::std::vector< sal_Int32>& _rOrgValues) + ,std::vector< sal_Int32>& _rOrgValues) { // use keys and indexes for exact positioning // first the keys @@ -209,7 +209,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow // Reference<XColumnsSupplier> Reference<XPropertySet> xIndexColsSup; Reference<XNameAccess> xIndexColumns; - ::std::vector< Reference<XNameAccess> > aAllIndexColumns; + std::vector< Reference<XNameAccess> > aAllIndexColumns; if(xIndexes.is()) { for(sal_Int32 j=0;j<xIndexes->getCount();++j) @@ -250,8 +250,8 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow _rOrgValues.push_back(nCheckCount); } - ::std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end(); - for( ::std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin(); + std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end(); + for( std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin(); aIndexIter != aIndexEnd;++aIndexIter) { if((*aIndexIter)->hasByName(aColumnName)) @@ -282,7 +282,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR // list all columns that should be set OUStringBuffer aCondition; - ::std::vector< sal_Int32> aOrgValues; + std::vector< sal_Int32> aOrgValues; fillParameters(_rInsertRow,_xTable,aCondition,aSql,aOrgValues); aSql[aSql.getLength() - 1] = ' '; if ( !aCondition.isEmpty() ) @@ -336,7 +336,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti // Reference<XColumnsSupplier> Reference<XPropertySet> xIndexColsSup; Reference<XNameAccess> xIndexColumns; - ::std::vector< Reference<XNameAccess> > aAllIndexColumns; + std::vector< Reference<XNameAccess> > aAllIndexColumns; if(xIndexes.is()) { for(sal_Int32 j=0;j<xIndexes->getCount();++j) @@ -351,7 +351,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti } OUStringBuffer aColumnName; - ::std::vector< sal_Int32> aOrgValues; + std::vector< sal_Int32> aOrgValues; fillParameters(_rDeleteRow,_xTable,aSql,aColumnName,aOrgValues); aSql.setLength(aSql.getLength()-5); @@ -594,7 +594,7 @@ bool OCacheSet::isResultSetChanged() const return false; } -void OCacheSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& /*io_aInsertRow*/,ORowSetValueVector::Vector& /*io_aRow*/,::std::vector<sal_Int32>& o_aChangedColumns) +void OCacheSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& /*io_aInsertRow*/,ORowSetValueVector::Vector& /*io_aRow*/,std::vector<sal_Int32>& o_aChangedColumns) { o_aChangedColumns.push_back(i_nColumnIndex); } @@ -604,7 +604,7 @@ bool OCacheSet::columnValuesUpdated(ORowSetValueVector::Vector& /*io_aCachedRow* return false; } -bool OCacheSet::updateColumnValues(const ORowSetValueVector::Vector& /*io_aCachedRow*/,ORowSetValueVector::Vector& /*io_aRow*/,const ::std::vector<sal_Int32>& /*i_aChangedColumns*/) +bool OCacheSet::updateColumnValues(const ORowSetValueVector::Vector& /*io_aCachedRow*/,ORowSetValueVector::Vector& /*io_aRow*/,const std::vector<sal_Int32>& /*i_aChangedColumns*/) { return true; } diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 214f50986ea9..5f2c50da9a90 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -68,7 +68,7 @@ namespace dbaccess ,const connectivity::OSQLTable& _xTable ,OUStringBuffer& _sCondition ,OUStringBuffer& _sParameter - ,::std::vector< sal_Int32>& _rOrgValues); + ,std::vector< sal_Int32>& _rOrgValues); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException void fillTableName(const css::uno::Reference< css::beans::XPropertySet>& _xTable); @@ -173,9 +173,9 @@ namespace dbaccess virtual bool isResultSetChanged() const; virtual void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet) = 0; - virtual void mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_aChangedColumns); + virtual void mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,std::vector<sal_Int32>& o_aChangedColumns); virtual bool columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow,const ORowSetValueVector::Vector& i_aRow); - virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns); + virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const std::vector<sal_Int32>& i_aChangedColumns); virtual void fillMissingValues(ORowSetValueVector::Vector& io_aRow) const; virtual bool previous_checked( bool i_bFetchRow ); virtual bool absolute_checked( sal_Int32 row,bool i_bFetchRow ); diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index e0d61ef24136..7a599e940c44 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -45,7 +45,7 @@ namespace dbaccess /** creates a vector of WildCards and reduce the _rTableFilter of the length of WildsCards */ -sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut) +sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::vector< WildCard >& _rOut) { // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them @@ -74,17 +74,17 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto bool lcl_isElementAllowed( const OUString& _rName, const Sequence< OUString >& _rTableFilter, - const ::std::vector< WildCard >& _rWCSearch ) + const std::vector< WildCard >& _rWCSearch ) { sal_Int32 nTableFilterLen = _rTableFilter.getLength(); const OUString* tableFilter = _rTableFilter.getConstArray(); const OUString* tableFilterEnd = _rTableFilter.getConstArray() + nTableFilterLen; - bool bFilterMatch = ::std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd; + bool bFilterMatch = std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd; // the table is allowed to "pass" if we had no filters at all or any of the non-wildcard filters matches if (!bFilterMatch && !_rWCSearch.empty()) { // or if one of the wildcard expression matches - for ( ::std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin(); + for ( std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin(); aLoop != _rWCSearch.end() && !bFilterMatch; ++aLoop ) @@ -118,7 +118,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto { } }; - typedef ::std::vector< TableInfo > TableInfos; + typedef std::vector< TableInfo > TableInfos; void lcl_ensureComposedName( TableInfo& _io_tableInfo, const Reference< XDatabaseMetaData >& _metaData ) { @@ -176,7 +176,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto { // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them - ::std::vector< WildCard > aWildCardTableFilter; + std::vector< WildCard > aWildCardTableFilter; Sequence< OUString > aNonWildCardTableFilter = _tableFilter; nTableFilterCount = createWildCardVector( aNonWildCardTableFilter, aWildCardTableFilter ); @@ -216,7 +216,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto // ensure that we know the table type lcl_ensureType( *table, _metaData, _masterContainer ); - if ( ::std::find( pTableTypeFilterBegin, pTableTypeFilterEnd, *table->sType ) != pTableTypeFilterEnd ) + if ( std::find( pTableTypeFilterBegin, pTableTypeFilterEnd, *table->sType ) != pTableTypeFilterEnd ) aFilteredTables.push_back( *table ); } } @@ -241,7 +241,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto IRefreshListener* _pRefreshListener, ::dbtools::WarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) - :OCollection(_rParent,_bCase,_rMutex,::std::vector< OUString>()) + :OCollection(_rParent,_bCase,_rMutex,std::vector< OUString>()) ,m_bConstructed(false) ,m_pWarningsContainer(_pWarningsContainer) ,m_pRefreshListener(_pRefreshListener) @@ -297,7 +297,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them - ::std::vector< WildCard > aWCSearch; + std::vector< WildCard > aWCSearch; createWildCardVector(aTableFilter,aWCSearch); try diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index ce1662eebd36..6042d163c8e4 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -41,7 +41,7 @@ namespace dbaccess bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector, + const std::vector< OUString> &_rVector, bool _bUseAsIndex ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector,_bUseAsIndex) ,m_aColumns(_rColumns) @@ -51,7 +51,7 @@ namespace dbaccess OPrivateColumns* OPrivateColumns::createWithIntrinsicNames( const ::rtl::Reference< ::connectivity::OSQLColumns >& _rColumns, bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex ) { - ::std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() ); + std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() ); OUString sColumName; for ( ::connectivity::OSQLColumns::Vector::const_iterator column = _rColumns->get().begin(); diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index 1f9bbb46e0d4..b64501246c56 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -57,7 +57,7 @@ namespace dbaccess bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector, + const std::vector< OUString> &_rVector, bool _bUseAsIndex = false ); @@ -90,7 +90,7 @@ namespace dbaccess bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector + const std::vector< OUString> &_rVector ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aTables(_rTables) { diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 1a9dcff9df76..1ca72b3fe1c0 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -67,7 +67,7 @@ using std::vector; namespace { - void lcl_fillIndexColumns(const Reference<XIndexAccess>& _xIndexes, ::std::vector< Reference<XNameAccess> >& _rAllIndexColumns) + void lcl_fillIndexColumns(const Reference<XIndexAccess>& _xIndexes, std::vector< Reference<XNameAccess> >& _rAllIndexColumns) { if ( _xIndexes.is() ) { @@ -151,7 +151,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, const OUString& i_rUpdateTableName, const Reference<XDatabaseMetaData>& i_xMeta, const Reference<XNameAccess>& i_xQueryColumns, - ::std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames) + std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames) { // first ask the database itself for the best columns which can be used Sequence< OUString> aBestColumnNames; @@ -322,7 +322,7 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet, const OUStrin // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first // without extra variable to be set - OKeySetValue keySetValue(nullptr,::std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())); + OKeySetValue keySetValue(nullptr,std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())); m_aKeyMap.insert(OKeySetMatrix::value_type(0, keySetValue)); m_aKeyIter = m_aKeyMap.begin(); } @@ -332,7 +332,7 @@ void OKeySet::reset(const Reference< XResultSet>& _xDriverSet) OCacheSet::construct(_xDriverSet, m_sRowSetFilter); m_bRowCountFinal = false; m_aKeyMap.clear(); - OKeySetValue keySetValue(nullptr,::std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())); + OKeySetValue keySetValue(nullptr,std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())); m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue)); m_aKeyIter = m_aKeyMap.begin(); } @@ -471,11 +471,11 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow if ( xIndexSup.is() ) xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); - ::std::vector< Reference<XNameAccess> > aAllIndexColumns; + std::vector< Reference<XNameAccess> > aAllIndexColumns; lcl_fillIndexColumns(xIndexes,aAllIndexColumns); OUStringBuffer sKeyCondition,sIndexCondition; - ::std::vector<sal_Int32> aIndexColumnPositions; + std::vector<sal_Int32> aIndexColumnPositions; const sal_Int32 nOldLength = aSql.getLength(); sal_Int32 i = 1; @@ -495,8 +495,8 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow } else { - ::std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end(); - for( ::std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin(); + std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end(); + for( std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin(); aIndexIter != aIndexEnd;++aIndexIter) { if((*aIndexIter)->hasByName(aIter->first)) @@ -551,7 +551,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow executeUpdate(_rInsertRow ,_rOriginalRow,aSql.makeStringAndClear(),"",aIndexColumnPositions); } -void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions) +void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOriginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const std::vector<sal_Int32>& _aIndexColumnPositions) { // now create end execute the prepared statement Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL)); @@ -573,7 +573,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO { if ( bRefetch ) { - bRefetch = ::std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end(); + bRefetch = std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end(); } impl_convertValue_throw(_rInsertRow,aIter->second); (_rInsertRow->get())[nPos].setSigned((_rOriginalRow->get())[nPos].isSigned()); @@ -595,8 +595,8 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO if ( !_aIndexColumnPositions.empty() ) { // now we have to set the index values - ::std::vector<sal_Int32>::const_iterator aIdxColIter = _aIndexColumnPositions.begin(); - ::std::vector<sal_Int32>::const_iterator aIdxColEnd = _aIndexColumnPositions.end(); + std::vector<sal_Int32>::const_iterator aIdxColIter = _aIndexColumnPositions.begin(); + std::vector<sal_Int32>::const_iterator aIdxColEnd = _aIndexColumnPositions.end(); j = 0; aIter = m_pColumnNames->begin(); for(;aIdxColIter != aIdxColEnd;++aIdxColIter,++i,++j,++aIter) @@ -639,7 +639,7 @@ void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivi { if ( bRefetch ) { - bRefetch = ::std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end(); + bRefetch = std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName) == m_aFilterColumns.end(); } aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName) + ","); aValues.append("?,"); @@ -717,8 +717,8 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ Reference< XResultSetMetaDataSupplier > xMdSup(xRes,UNO_QUERY); Reference< XResultSetMetaData > xMd = xMdSup->getMetaData(); sal_Int32 nColumnCount = xMd->getColumnCount(); - ::std::vector< OUString >::const_iterator aAutoIter = m_aAutoColumns.begin(); - ::std::vector< OUString >::const_iterator aAutoEnd = m_aAutoColumns.end(); + std::vector< OUString >::const_iterator aAutoIter = m_aAutoColumns.begin(); + std::vector< OUString >::const_iterator aAutoEnd = m_aAutoColumns.end(); for (sal_Int32 i = 1;aAutoIter != aAutoEnd && i <= nColumnCount; ++aAutoIter,++i) { SelectColumnsMetaData::const_iterator aFind = m_pKeyColumnNames->find(*aAutoIter); @@ -745,8 +745,8 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ const OUString sQuote = getIdentifierQuoteString(); OUString sMaxStmt; aEnd = m_pKeyColumnNames->end(); - ::std::vector< OUString >::const_iterator aAutoIter = m_aAutoColumns.begin(); - ::std::vector< OUString >::const_iterator aAutoEnd = m_aAutoColumns.end(); + std::vector< OUString >::const_iterator aAutoIter = m_aAutoColumns.begin(); + std::vector< OUString >::const_iterator aAutoEnd = m_aAutoColumns.end(); for (;aAutoIter != aAutoEnd; ++aAutoIter) { // we will only fetch values which are keycolumns @@ -796,7 +796,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >(m_pKeyColumnNames->size()); copyRowValue(_rInsertRow,aKeyRow,aKeyIter->first + 1); - m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(1,Reference<XRow>())))).first; + m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,std::pair<sal_Int32,Reference<XRow> >(1,Reference<XRow>())))).first; // now we set the bookmark for this row (_rInsertRow->get())[0] = makeAny((sal_Int32)m_aKeyIter->first); tryRefetch(_rInsertRow,bRefetch); @@ -881,11 +881,11 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); // Reference<XColumnsSupplier> - ::std::vector< Reference<XNameAccess> > aAllIndexColumns; + std::vector< Reference<XNameAccess> > aAllIndexColumns; lcl_fillIndexColumns(xIndexes,aAllIndexColumns); OUStringBuffer sIndexCondition; - ::std::vector<sal_Int32> aIndexColumnPositions; + std::vector<sal_Int32> aIndexColumnPositions; SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end(); @@ -906,8 +906,8 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit } else { - ::std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end(); - for( ::std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin(); + std::vector< Reference<XNameAccess> >::const_iterator aIndexEnd = aAllIndexColumns.end(); + for( std::vector< Reference<XNameAccess> >::const_iterator aIndexIter = aAllIndexColumns.begin(); aIndexIter != aIndexEnd;++aIndexIter) { if((*aIndexIter)->hasByName(aIter->first)) @@ -943,8 +943,8 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit } // now we have to set the index values - ::std::vector<sal_Int32>::const_iterator aIdxColIter = aIndexColumnPositions.begin(); - ::std::vector<sal_Int32>::const_iterator aIdxColEnd = aIndexColumnPositions.end(); + std::vector<sal_Int32>::const_iterator aIdxColIter = aIndexColumnPositions.begin(); + std::vector<sal_Int32>::const_iterator aIdxColEnd = aIndexColumnPositions.end(); aIter = m_pColumnNames->begin(); for(;aIdxColIter != aIdxColEnd;++aIdxColIter,++i,++aIter) { @@ -1098,7 +1098,7 @@ sal_Int32 SAL_CALL OKeySet::getRow( ) OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!"); OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!"); - return ::std::distance(m_aKeyMap.begin(),m_aKeyIter); + return std::distance(m_aKeyMap.begin(),m_aKeyIter); } bool SAL_CALL OKeySet::absolute( sal_Int32 row ) @@ -1311,7 +1311,7 @@ bool OKeySet::fetchRow() const SelectColumnDescription& rColDesc = aPosIter->second; aIter->fill(rColDesc.nPosition, rColDesc.nType, m_xRow); } - m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,::std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())))).first; + m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())))).first; } else m_bRowCountFinal = true; @@ -1560,7 +1560,7 @@ void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const Select sal_Int32 nIndex = sValue.indexOf('.'); if ( nIndex != -1 ) { - aValue = sValue.copy(0,::std::min(sValue.getLength(),nIndex + (i_aMetaData.nScale > 0 ? i_aMetaData.nScale + 1 : 0))); + aValue = sValue.copy(0,std::min(sValue.getLength(),nIndex + (i_aMetaData.nScale > 0 ? i_aMetaData.nScale + 1 : 0))); } } break; diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index f8c65d78a426..266b51ca28a0 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -60,7 +60,7 @@ namespace dbaccess { } }; - typedef ::std::map< OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; + typedef std::map< OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; // the elements of _rxQueryColumns must have the properties PROPERTY_REALNAME and PROPERTY_TABLENAME void getColumnPositions(const css::uno::Reference< css::container::XNameAccess >& _rxQueryColumns, @@ -69,9 +69,9 @@ namespace dbaccess SelectColumnsMetaData& o_rColumnNames /* out */, bool i_bAppendTableName = false); - typedef ::std::pair<ORowSetRow,::std::pair<sal_Int32,css::uno::Reference< css::sdbc::XRow> > > OKeySetValue; - typedef ::std::map<sal_Int32,OKeySetValue > OKeySetMatrix; - typedef ::std::map<sal_Int32, rtl::Reference<ORowSetValueVector> > OUpdatedParameter; + typedef std::pair<ORowSetRow,std::pair<sal_Int32,css::uno::Reference< css::sdbc::XRow> > > OKeySetValue; + typedef std::map<sal_Int32,OKeySetValue > OKeySetMatrix; + typedef std::map<sal_Int32, rtl::Reference<ORowSetValueVector> > OUpdatedParameter; // is used when the source supports keys class OKeySet : public OCacheSet { @@ -79,22 +79,22 @@ namespace dbaccess OKeySetMatrix m_aKeyMap; OKeySetMatrix::iterator m_aKeyIter; - ::std::vector< OUString > m_aAutoColumns; // contains all columns which are autoincrement ones + std::vector< OUString > m_aAutoColumns; // contains all columns which are autoincrement ones OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching rtl::Reference<ORowSetValueVector> m_aParameterValueForCache; - ::std::unique_ptr<SelectColumnsMetaData> m_pKeyColumnNames; // contains all key column names - ::std::unique_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names - ::std::unique_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names - ::std::unique_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest + std::unique_ptr<SelectColumnsMetaData> m_pKeyColumnNames; // contains all key column names + std::unique_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names + std::unique_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names + std::unique_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest connectivity::OSQLTable m_xTable; // reference to our table css::uno::Reference< css::container::XIndexAccess> m_xTableKeys; // we need a different SQL (statement) for each different combination // of NULLness of key & foreign columns; // each subclause is either "colName = ?" or "colName IS NULL" // (we avoid the standard "colName IS NOT DISTINCT FROM ?" because it is not widely supported) - typedef ::std::vector< bool > FilterColumnsNULL_t; - typedef ::std::map< FilterColumnsNULL_t, + typedef std::vector< bool > FilterColumnsNULL_t; + typedef std::map< FilterColumnsNULL_t, css::uno::Reference< css::sdbc::XPreparedStatement > > vStatements_t; vStatements_t m_vStatements; @@ -103,7 +103,7 @@ namespace dbaccess css::uno::Reference< css::sdbc::XRow> m_xRow; css::uno::Reference< css::sdb::XSingleSelectQueryAnalyzer > m_xComposer; const OUString m_sUpdateTableName; - ::std::vector< OUString > m_aFilterColumns; + std::vector< OUString > m_aFilterColumns; sal_Int32& m_rRowCount; bool m_bRowCountFinal; @@ -128,7 +128,7 @@ namespace dbaccess const OUString& i_rUpdateTableName, const css::uno::Reference< css::sdbc::XDatabaseMetaData>& i_xMeta, const css::uno::Reference< css::container::XNameAccess>& i_xQueryColumns, - ::std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames); + std::unique_ptr<SelectColumnsMetaData>& o_pKeyColumnNames); void ensureStatement( ); virtual void makeNewStatement( ); static void setOneKeyColumnParameter( sal_Int32 &nPos, @@ -141,7 +141,7 @@ namespace dbaccess /// @throws css::uno::RuntimeException bool doTryRefetch_throw(); void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); - void executeUpdate(const ORowSetRow& _rInsertRow, const ORowSetRow& _rOriginalRow, const OUString& i_sSQL, const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>()); + void executeUpdate(const ORowSetRow& _rInsertRow, const ORowSetRow& _rOriginalRow, const OUString& i_sSQL, const OUString& i_sTableName,const std::vector<sal_Int32>& _aIndexColumnPositions = std::vector<sal_Int32>()); void executeInsert( const ORowSetRow& _rInsertRow, const OUString& i_sSQL, const OUString& i_sTableName, bool bRefetch = false); void executeStatement(OUStringBuffer& io_aFilter, css::uno::Reference< css::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 88eb6a1696d7..84c3e6ff372d 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -118,14 +118,14 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OU const OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength(); for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter) { - ::std::unique_ptr<SelectColumnsMetaData> pKeyColumNames(new SelectColumnsMetaData(bCase)); + std::unique_ptr<SelectColumnsMetaData> pKeyColumNames(new SelectColumnsMetaData(bCase)); findTableColumnsMatching_throw(xTables->getByName(*pTableNameIter),*pTableNameIter,xMeta,xQueryColumns,pKeyColumNames); m_pKeyColumnNames->insert(pKeyColumNames->begin(),pKeyColumNames->end()); } // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first // without extra variable to be set - OKeySetValue keySetValue(nullptr,::std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())); + OKeySetValue keySetValue(nullptr,std::pair<sal_Int32,Reference<XRow> >(0,Reference<XRow>())); m_aKeyMap.insert(OKeySetMatrix::value_type(0,keySetValue)); m_aKeyIter = m_aKeyMap.begin(); @@ -136,7 +136,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OU xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery()); // check for joins OUString aErrorMsg; - ::std::unique_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) ); + std::unique_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) ); m_aSqlIterator.setParseTree( pStatementNode.get() ); m_aSqlIterator.traverseAll(); fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions()); @@ -174,7 +174,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow // list all columns that should be set OUString aQuote = getIdentifierQuoteString(); - ::std::map< OUString,bool > aResultSetChanged; + std::map< OUString,bool > aResultSetChanged; TSQLStatements aKeyConditions; TSQLStatements aSql; @@ -196,7 +196,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end() ) throw SQLException(); - ::std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(aIter->second.nPosition); + std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(aIter->second.nPosition); if ( aJoinIter != m_aJoinedColumns.end() ) { (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition]; @@ -241,7 +241,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn TSQLStatements aSql; TSQLStatements aParameter; TSQLStatements aKeyConditions; - ::std::map< OUString,bool > aResultSetChanged; + std::map< OUString,bool > aResultSetChanged; OUString aQuote = getIdentifierQuoteString(); // here we build the condition part for the update statement @@ -260,7 +260,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn lcl_fillKeyCondition(aIter->second.sTableName,sQuotedColumnName,(_rInsertRow->get())[aIter->second.nPosition],aKeyConditions); aResultSetChanged[aIter->second.sTableName] = true; } - ::std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(aIter->second.nPosition); + std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(aIter->second.nPosition); if ( aJoinIter != m_aJoinedColumns.end() ) { (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition]; @@ -391,9 +391,9 @@ void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString& } } -void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_aJoinColumns) +void OptimisticSet::fillJoinedColumns_throw(const std::vector< TNodePair >& i_aJoinColumns) { - ::std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin(); + std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin(); for(;aIter != i_aJoinColumns.end();++aIter) { OUString sColumnName,sTableName; @@ -452,10 +452,10 @@ bool OptimisticSet::isResultSetChanged() const return bOld; } -void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_aChangedColumns) +void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,std::vector<sal_Int32>& o_aChangedColumns) { o_aChangedColumns.push_back(i_nColumnIndex); - ::std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(i_nColumnIndex); + std::map<sal_Int32,sal_Int32>::const_iterator aJoinIter = m_aJoinedColumns.find(i_nColumnIndex); if ( aJoinIter != m_aJoinedColumns.end() ) { io_aRow[aJoinIter->second] = io_aRow[i_nColumnIndex]; @@ -465,19 +465,19 @@ void OptimisticSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVecto } } -bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns) +bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const std::vector<sal_Int32>& i_aChangedColumns) { bool bRet = false; for( const auto& aColIdx : i_aChangedColumns ) { - SelectColumnsMetaData::const_iterator aFind = ::std::find_if( + SelectColumnsMetaData::const_iterator aFind = std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(), [&aColIdx]( const SelectColumnsMetaData::value_type& aType ) { return aType.second.nPosition == aColIdx; } ); if ( aFind != m_pKeyColumnNames->end() ) { const OUString sTableName = aFind->second.sTableName; - aFind = ::std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(), + aFind = std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(), [&sTableName] ( const SelectColumnsMetaData::value_type& rCurr ) { return rCurr.second.sTableName == sTableName; } ); @@ -511,14 +511,14 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow for( const auto& aCol : *m_pColumnNames ) { sal_Int32 nPos = aCol.second.nPosition; - SelectColumnsMetaData::const_iterator aFind = ::std::find_if( + SelectColumnsMetaData::const_iterator aFind = std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(), [&nPos] ( const SelectColumnsMetaData::value_type& aType ) { return aType.second.nPosition == nPos; } ); if ( aFind != m_pKeyColumnNames->end() ) { const OUString sTableName = aFind->second.sTableName; - aFind = ::std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(), + aFind = std::find_if( m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(), [&sTableName] ( const SelectColumnsMetaData::value_type& rCurr ) { return rCurr.second.sTableName == sTableName; } ); @@ -551,7 +551,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const { TSQLStatements aSql; TSQLStatements aKeyConditions; - ::std::map< OUString,bool > aResultSetChanged; + std::map< OUString,bool > aResultSetChanged; OUString aQuote = getIdentifierQuoteString(); // here we build the condition part for the update statement SelectColumnsMetaData::const_iterator aColIter = m_pColumnNames->begin(); diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index 92766fd8abe4..417ab833e48f 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -36,13 +36,13 @@ namespace dbaccess ::connectivity::OSQLParser m_aSqlParser; ::connectivity::OSQLParseTreeIterator m_aSqlIterator; - ::std::map<sal_Int32,sal_Int32> m_aJoinedColumns; - ::std::map<sal_Int32,sal_Int32> m_aJoinedKeyColumns; + std::map<sal_Int32,sal_Int32> m_aJoinedColumns; + std::map<sal_Int32,sal_Int32> m_aJoinedKeyColumns; mutable bool m_bResultSetChanged; void executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName); - void fillJoinedColumns_throw(const ::std::vector< ::connectivity::TNodePair>& i_aJoinColumns); + void fillJoinedColumns_throw(const std::vector< ::connectivity::TNodePair>& i_aJoinColumns); void fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn); protected: virtual void makeNewStatement( ) override; @@ -65,13 +65,13 @@ namespace dbaccess // CacheSet virtual bool isResultSetChanged() const override; - virtual void mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_aChangedColumns) override; + virtual void mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& io_aInsertRow,ORowSetValueVector::Vector& io_aRow,std::vector<sal_Int32>& o_aChangedColumns) override; virtual bool columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow,const ORowSetValueVector::Vector& i_aRow) override; - virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const ::std::vector<sal_Int32>& i_aChangedColumns) override; + virtual bool updateColumnValues(const ORowSetValueVector::Vector& io_aCachedRow,ORowSetValueVector::Vector& io_aRow,const std::vector<sal_Int32>& i_aChangedColumns) override; virtual void fillMissingValues(ORowSetValueVector::Vector& io_aRow) const override; bool isReadOnly() const { return m_aJoinedKeyColumns.empty(); } - const ::std::map<sal_Int32,sal_Int32>& getJoinedKeyColumns() const { return m_aJoinedKeyColumns; } + const std::map<sal_Int32,sal_Int32>& getJoinedKeyColumns() const { return m_aJoinedKeyColumns; } }; } #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_OPTIMISTICSET_HXX diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index f8e26041972c..aaaaab135f97 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -566,7 +566,7 @@ void ORowSet::freeResources( bool _bComplete ) // the columns must be disposed before the querycomposer is disposed because // their owner can be the composer TDataColumns().swap(m_aDataColumns);// clear and resize capacity - ::std::vector<bool>().swap(m_aReadOnlyDataColumns); + std::vector<bool>().swap(m_aReadOnlyDataColumns); m_xColumns = nullptr; if ( m_pColumns ) @@ -909,7 +909,7 @@ void SAL_CALL ORowSet::insertRow() RowsChangeEvent aEvt(*this,RowChangeAction::INSERT,1,aChangedBookmarks); notifyAllListenersRowBeforeChange(aGuard,aEvt); - ::std::vector< Any > aBookmarks; + std::vector< Any > aBookmarks; bool bInserted = m_pCache->insertRow(aBookmarks); // make sure that our row is set to the new inserted row before clearing the insert flags in the cache @@ -963,7 +963,7 @@ void SAL_CALL ORowSet::updateRow( ) RowsChangeEvent aEvt(*this,RowChangeAction::UPDATE,1,aChangedBookmarks); notifyAllListenersRowBeforeChange(aGuard,aEvt); - ::std::vector< Any > aBookmarks; + std::vector< Any > aBookmarks; m_pCache->updateRow(m_aCurrentRow.operator ->(),aBookmarks); if ( !aBookmarks.empty() ) aEvt.Bookmarks = Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size()); @@ -1243,7 +1243,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw() impl_restoreDataColumnsWriteable_throw(); TDataColumns::const_iterator aIter = m_aDataColumns.begin(); m_aReadOnlyDataColumns.resize(m_aDataColumns.size(),false); - ::std::vector<bool, std::allocator<bool> >::iterator aReadIter = m_aReadOnlyDataColumns.begin(); + std::vector<bool, std::allocator<bool> >::iterator aReadIter = m_aReadOnlyDataColumns.begin(); for(;aIter != m_aDataColumns.end();++aIter,++aReadIter) { bool bReadOnly = false; @@ -1258,7 +1258,7 @@ void ORowSet::impl_restoreDataColumnsWriteable_throw() { assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || m_aReadOnlyDataColumns.size() == 0 ); TDataColumns::const_iterator aIter = m_aDataColumns.begin(); - ::std::vector<bool, std::allocator<bool> >::const_iterator aReadIter = m_aReadOnlyDataColumns.begin(); + std::vector<bool, std::allocator<bool> >::const_iterator aReadIter = m_aReadOnlyDataColumns.begin(); for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter) { (*aIter)->setPropertyValue(PROPERTY_ISREADONLY, makeAny( (bool)*aReadIter ) ); @@ -1849,10 +1849,10 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi m_xNumberFormatTypes.set(xNumberFormat->getNumberFormats(),UNO_QUERY); ::rtl::Reference< ::connectivity::OSQLColumns> aColumns = new ::connectivity::OSQLColumns(); - ::std::vector< OUString> aNames; + std::vector< OUString> aNames; OUString aDescription; - const ::std::map<sal_Int32,sal_Int32>& rKeyColumns = m_pCache->getKeyColumns(); + const std::map<sal_Int32,sal_Int32>& rKeyColumns = m_pCache->getKeyColumns(); if(!m_xColumns.is()) { SAL_INFO("dbaccess", "ORowSet::execute_NoApprove_NoNewConn::creating columns" ); @@ -1930,7 +1930,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi sal_Int32 nCount = xMeta->getColumnCount(); m_aDataColumns.reserve(nCount+1); aColumns->get().reserve(nCount+1); - ::std::set< Reference< XPropertySet > > aAllColumns; + std::set< Reference< XPropertySet > > aAllColumns; for(sal_Int32 i=1; i <= nCount ;++i) { @@ -2448,7 +2448,7 @@ void ORowSet::impl_initParametersContainer_nothrow() m_pParameters = new param::ParameterWrapperContainer( m_xComposer.get() ); // copy the premature parameters into the final ones - size_t nParamCount( ::std::min( m_pParameters->size(), m_aPrematureParamValues->get().size() ) ); + size_t nParamCount( std::min( m_pParameters->size(), m_aPrematureParamValues->get().size() ) ); for ( size_t i=0; i<nParamCount; ++i ) { (*m_pParameters)[i] = m_aPrematureParamValues->get()[i]; @@ -2798,7 +2798,7 @@ ORowSetClone::ORowSetClone( const Reference<XComponentContext>& _rContext, ORowS m_aOldRow = m_pCache->registerOldRow(); ::rtl::Reference< ::connectivity::OSQLColumns> aColumns = new ::connectivity::OSQLColumns(); - ::std::vector< OUString> aNames; + std::vector< OUString> aNames; OUString aDescription; Locale aLocale = SvtSysLocale().GetLanguageTag().getLocale(); diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 0e92d1cc3391..c580264574e3 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -90,8 +90,8 @@ namespace dbaccess */ rtl::Reference<ORowSetValueVector> m_aPrematureParamValues; rtl::Reference<ORowSetValueVector> m_aParameterValueForCache; - ::std::vector<bool> m_aParametersSet; - ::std::vector<bool> m_aReadOnlyDataColumns; + std::vector<bool> m_aParametersSet; + std::vector<bool> m_aReadOnlyDataColumns; ::comphelper::OInterfaceContainerHelper2 m_aRowsetListeners; ::comphelper::OInterfaceContainerHelper2 m_aApproveListeners; diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 0f37b643ff04..d90ad84af330 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -60,7 +60,7 @@ protected: virtual void impl_refresh() override; virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName) override; public: - OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent, true, _rMutex, ::std::vector< OUString>()){} + OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent, true, _rMutex, std::vector< OUString>()){} }; void OEmptyCollection::impl_refresh() @@ -776,8 +776,8 @@ void SAL_CALL ORowSetBase::afterLast( ) SAL_INFO("dbaccess", "ORowSetBase::afterLast() Clone = " << m_bClone); } -bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor, - ::std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor) +bool SAL_CALL ORowSetBase::move( std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor, + std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor) { SAL_INFO("dbaccess", "ORowSetBase::move() Clone = " << m_bClone); ::connectivity::checkDisposed(m_rBHelper.bDisposed); @@ -826,16 +826,16 @@ bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckF sal_Bool SAL_CALL ORowSetBase::first( ) { SAL_INFO("dbaccess", "ORowSetBase::first() Clone = " << m_bClone); - ::std::mem_fun_t<bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst); - ::std::mem_fun_t<bool,ORowSetCache> F_tmp(&ORowSetCache::first); + std::mem_fun_t<bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst); + std::mem_fun_t<bool,ORowSetCache> F_tmp(&ORowSetCache::first); return move(ioF_tmp,F_tmp); } sal_Bool SAL_CALL ORowSetBase::last( ) { SAL_INFO("dbaccess", "ORowSetBase::last() Clone = " << m_bClone); - ::std::mem_fun_t<bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast); - ::std::mem_fun_t<bool,ORowSetCache> L_tmp(&ORowSetCache::last); + std::mem_fun_t<bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast); + std::mem_fun_t<bool,ORowSetCache> L_tmp(&ORowSetCache::last); return move(ioL_tmp,L_tmp); } @@ -1364,7 +1364,7 @@ sal_Int32 ORowSetBase::impl_getRowCount() const struct ORowSetNotifierImpl { - ::std::vector<sal_Int32> aChangedColumns; + std::vector<sal_Int32> aChangedColumns; ORowSetValueVector::Vector aRow; }; @@ -1427,7 +1427,7 @@ void ORowSetNotifier::fire() #endif } -::std::vector<sal_Int32>& ORowSetNotifier::getChangedColumns() const +std::vector<sal_Int32>& ORowSetNotifier::getChangedColumns() const { OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!"); return m_pImpl->aChangedColumns; @@ -1438,7 +1438,7 @@ void ORowSetNotifier::firePropertyChange() OSL_ENSURE(m_pImpl.get(),"Illegal CTor call, use the other one!"); if( m_pImpl.get() ) { - ::std::vector<sal_Int32>::const_iterator aIter = m_pImpl->aChangedColumns.begin(); + std::vector<sal_Int32>::const_iterator aIter = m_pImpl->aChangedColumns.begin(); for(;aIter != m_pImpl->aChangedColumns.end();++aIter) { m_pRowSet->firePropertyChange((*aIter)-1 ,m_pImpl->aRow[(*aIter)-1], ORowSetBase::GrantNotifierAccess()); diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index ca2a425c4f32..385ef02aed57 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -74,7 +74,7 @@ namespace dbaccess { OModuleClient m_aModuleClient; protected: - typedef ::std::vector<ORowSetDataColumn*> TDataColumns; + typedef std::vector<ORowSetDataColumn*> TDataColumns; ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself ::osl::Mutex // we need a extra mutex for columns to prevend deadlock when setting new values // for a row @@ -202,8 +202,8 @@ namespace dbaccess @return <TRUE/> if movement was successful. */ - bool SAL_CALL move( ::std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor, - ::std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor); + bool SAL_CALL move( std::mem_fun_t<bool,ORowSetBase>& _aCheckFunctor, + std::mem_fun_t<bool,ORowSetCache>& _aMovementFunctor); /** same meaning as isFirst. Only need by mem_fun @return @@ -356,7 +356,7 @@ namespace dbaccess class ORowSetNotifier { private: - ::std::unique_ptr<ORowSetNotifierImpl> m_pImpl; + std::unique_ptr<ORowSetNotifierImpl> m_pImpl; ORowSetBase* m_pRowSet; // not acquired! This is not necessary because this class here is to be used on the stack within // a method of ORowSetBase (or derivees) @@ -402,7 +402,7 @@ namespace dbaccess /** use this one to store the inde of the changed column values */ - ::std::vector<sal_Int32>& getChangedColumns() const; + std::vector<sal_Int32>& getChangedColumns() const; }; diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index c1863f66ab53..0f340a5ed97e 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -385,8 +385,8 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize) else { // now correct the iterator in our iterator vector - ::std::vector<sal_Int32> aPositions; - ::std::map<sal_Int32,bool> aCacheIterToChange; + std::vector<sal_Int32> aPositions; + std::map<sal_Int32,bool> aCacheIterToChange; // first get the positions where they stand now ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); ORowSetCacheMap::const_iterator aCacheEnd = m_aCacheIterators.end(); @@ -411,8 +411,8 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize) m_aMatrixEnd = m_pMatrix->end(); // now adjust their positions because a resize invalidates all iterators - ::std::vector<sal_Int32>::const_iterator aIter = aPositions.begin(); - ::std::map<sal_Int32,bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin(); + std::vector<sal_Int32>::const_iterator aIter = aPositions.begin(); + std::map<sal_Int32,bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin(); for( aCacheIter = m_aCacheIterators.begin(); aPosChangeIter != aCacheIterToChange.end(); ++aPosChangeIter,++aCacheIter) @@ -552,7 +552,7 @@ sal_Int32 ORowSetCache::hashBookmark( const Any& bookmark ) // XRowUpdate void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -572,7 +572,7 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector& void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -592,7 +592,7 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x , sal_Int32 length,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -613,7 +613,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -635,7 +635,7 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -795,7 +795,7 @@ bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos, sal_Int32 &_nNewEndPos) bCheck = m_xCacheSet->next(); } if(aIter != aEnd) - ::std::rotate(m_pMatrix->begin(),aEnd,aIter); + std::rotate(m_pMatrix->begin(),aEnd,aIter); break; } bCheck = m_xCacheSet->next(); @@ -912,7 +912,7 @@ void ORowSetCache::moveWindow() fill(aIter, aNewEnd, nPos, bCheck); } - ::std::rotate(m_pMatrix->begin(), aEnd, aNewEnd); + std::rotate(m_pMatrix->begin(), aEnd, aNewEnd); // now correct the iterator in our iterator vector // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); @@ -994,7 +994,7 @@ void ORowSetCache::moveWindow() { OSL_ENSURE(aIter == aEnd, "fill() said went till end, but did not."); // rotate the end to the front - ::std::rotate(m_pMatrix->begin(), aIter, aDataEnd); + std::rotate(m_pMatrix->begin(), aIter, aDataEnd); // now correct the iterator in our iterator vector rotateCacheIterator( nNewStartPosInMatrix ); m_nStartPos = nNewStartPos; @@ -1028,7 +1028,7 @@ void ORowSetCache::moveWindow() nPos -= 1; m_nStartPos += nFetchedRows; m_nEndPos = nPos; - ::std::rotate(m_pMatrix->begin(), aIter, aDataEnd); + std::rotate(m_pMatrix->begin(), aIter, aDataEnd); // now correct the iterator in our iterator vector rotateCacheIterator( nFetchedRows ); @@ -1271,7 +1271,7 @@ bool ORowSetCache::rowInserted( ) } // XResultSetUpdate -bool ORowSetCache::insertRow(::std::vector< Any >& o_aBookmarks) +bool ORowSetCache::insertRow(std::vector< Any >& o_aBookmarks) { if ( !m_bNew || !m_aInsertRow->is() ) throw SQLException(DBACORE_RESSTRING(RID_STR_NO_MOVETOINSERTROW_CALLED),nullptr,SQLSTATE_GENERAL,1000,Any() ); @@ -1327,7 +1327,7 @@ void ORowSetCache::cancelRowModification() resetInsertRow(false); } -void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector< Any >& o_aBookmarks ) +void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,std::vector< Any >& o_aBookmarks ) { if(isAfterLast() || isBeforeFirst()) throw SQLException(DBACORE_RESSTRING(RID_STR_NO_UPDATEROW),nullptr,SQLSTATE_GENERAL,1000,Any() ); @@ -1568,7 +1568,7 @@ bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, OUString sSql = _xAnalyzer->getQuery(); OUString sErrorMsg; ::connectivity::OSQLParser aSqlParser( m_aContext ); - ::std::unique_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); + std::unique_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); if ( pSqlParseNode.get() && SQL_ISRULE(pSqlParseNode, select_statement) ) { OSQLParseNode* pTableRefCommalist = pSqlParseNode->getByRule(::connectivity::OSQLParseNode::table_ref_commalist); @@ -1719,7 +1719,7 @@ void ORowSetCache::reset(const Reference< XResultSet>& _xDriverSet) } void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns) + ,std::vector<sal_Int32>& o_ChangedColumns) { if ( o_ChangedColumns.size() > 1 ) { diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 8838254bcb55..363731ad65aa 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -55,9 +55,9 @@ namespace dbaccess friend class ORowSetClone; friend class ORowSetCacheIterator; - typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows; + typedef std::vector< TORowSetOldRowHelperRef > TOldRowSetRows; - ::std::map<sal_Int32,sal_Int32> m_aKeyColumns; + std::map<sal_Int32,sal_Int32> m_aKeyColumns; //the set can be static, bookmarkable or keyset css::uno::WeakReference< css::sdbc::XResultSet> m_xSet; css::uno::Reference< css::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow @@ -101,11 +101,11 @@ namespace dbaccess void updateValue(sal_Int32 columnIndex ,const connectivity::ORowSetValue& x ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ); void impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ); // checks and set the flags isAfterLast isLast and position when afterlast is true void checkPositionFlags(); @@ -160,13 +160,13 @@ namespace dbaccess sal_Int32 hashBookmark( const css::uno::Any& bookmark ); // css::sdbc::XRowUpdate - void updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length,ORowSetValueVector::Vector& io_aRow,::std::vector<sal_Int32>& o_ChangedColumns + void updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length,ORowSetValueVector::Vector& io_aRow,std::vector<sal_Int32>& o_ChangedColumns ); - void updateObject( sal_Int32 columnIndex, const css::uno::Any& x,ORowSetValueVector::Vector& io_aRow ,::std::vector<sal_Int32>& o_ChangedColumns); - void updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale,ORowSetValueVector::Vector& io_aRow ,::std::vector<sal_Int32>& o_ChangedColumns); + void updateObject( sal_Int32 columnIndex, const css::uno::Any& x,ORowSetValueVector::Vector& io_aRow ,std::vector<sal_Int32>& o_ChangedColumns); + void updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale,ORowSetValueVector::Vector& io_aRow ,std::vector<sal_Int32>& o_ChangedColumns); void updateNull(sal_Int32 columnIndex ,ORowSetValueVector::Vector& io_aRow - ,::std::vector<sal_Int32>& o_ChangedColumns + ,std::vector<sal_Int32>& o_ChangedColumns ); // css::sdbc::XResultSet @@ -188,15 +188,15 @@ namespace dbaccess bool rowInserted( ); // css::sdbc::XResultSetUpdate - bool insertRow(::std::vector< css::uno::Any >& o_aBookmarks); + bool insertRow(std::vector< css::uno::Any >& o_aBookmarks); void resetInsertRow(bool _bClearInsertRow); - void updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector< css::uno::Any >& o_aBookmarks ); + void updateRow( ORowSetMatrix::iterator& _rUpdateRow,std::vector< css::uno::Any >& o_aBookmarks ); bool deleteRow(); void cancelRowUpdates( ); void moveToInsertRow( ); - const ::std::map<sal_Int32,sal_Int32>& getKeyColumns() const { return m_aKeyColumns; } + const std::map<sal_Int32,sal_Int32>& getKeyColumns() const { return m_aKeyColumns; } bool isResultSetChanged() const; void reset(const css::uno::Reference< css::sdbc::XResultSet>& _xDriverSet); }; diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index 93368e089cea..2763fbf6aa6f 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -29,7 +29,7 @@ namespace dbaccess { typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector; typedef ::rtl::Reference< ORowSetValueVector > ORowSetRow; - typedef ::std::vector< ORowSetRow > ORowSetMatrix; + typedef std::vector< ORowSetRow > ORowSetMatrix; class ORowSetOldRowHelper : public salhelper::SimpleReferenceObject { diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index b580068d12b7..49515b84cd46 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -265,13 +265,13 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc OSingleSelectQueryComposer::~OSingleSelectQueryComposer() { - ::std::vector<OPrivateColumns*>::const_iterator aColIter = m_aColumnsCollection.begin(); - ::std::vector<OPrivateColumns*>::const_iterator aEnd = m_aColumnsCollection.end(); + std::vector<OPrivateColumns*>::const_iterator aColIter = m_aColumnsCollection.begin(); + std::vector<OPrivateColumns*>::const_iterator aEnd = m_aColumnsCollection.end(); for(;aColIter != aEnd;++aColIter) delete *aColIter; - ::std::vector<OPrivateTables*>::const_iterator aTabIter = m_aTablesCollection.begin(); - ::std::vector<OPrivateTables*>::const_iterator aTabEnd = m_aTablesCollection.end(); + std::vector<OPrivateTables*>::const_iterator aTabIter = m_aTablesCollection.begin(); + std::vector<OPrivateTables*>::const_iterator aTabEnd = m_aTablesCollection.end(); for(;aTabIter != aTabEnd;++aTabIter) delete *aTabIter; } @@ -427,13 +427,13 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getSt void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) { - ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause); + std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause); setConditionByColumn(column,andCriteria,F_tmp,filterOperator); } void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) { - ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetFilter); + std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString&> F_tmp(&OSingleSelectQueryComposer::implSetFilter); setConditionByColumn(column,andCriteria,F_tmp,filterOperator); } @@ -570,7 +570,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< setGroup( aComposer.getComposedAndClear() ); } -OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vector< OUString >& _rParts ) +OUString OSingleSelectQueryComposer::composeStatementFromParts( const std::vector< OUString >& _rParts ) { OSL_ENSURE( _rParts.size() == (size_t)SQLPartCount, "OSingleSelectQueryComposer::composeStatementFromParts: invalid parts array!" ); @@ -596,7 +596,7 @@ void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _r ::osl::MutexGuard aGuard( m_aMutex ); // remember the 4 current "additive" clauses - ::std::vector< OUString > aAdditiveClauses( SQLPartCount ); + std::vector< OUString > aAdditiveClauses( SQLPartCount ); for ( SQLPart eLoopParts = Where; eLoopParts != SQLPartCount; incSQLPart( eLoopParts ) ) aAdditiveClauses[ eLoopParts ] = getSQLPart( eLoopParts, m_aAdditiveIterator, false ); @@ -649,7 +649,7 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const return; // collect the 4 single parts as they're currently set - ::std::vector< OUString > aClauses; + std::vector< OUString > aClauses; aClauses.reserve( (size_t)SQLPartCount ); for ( SQLPart eLoopParts = Where; eLoopParts != SQLPartCount; incSQLPart( eLoopParts ) ) aClauses.push_back( getSQLPart( eLoopParts, m_aSqlIterator, true ) ); @@ -730,7 +730,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables( ) if ( !m_pTables ) { const OSQLTables& aTables = m_aSqlIterator.getTables(); - ::std::vector< OUString> aNames; + std::vector< OUString> aNames; OSQLTables::const_iterator aEnd = aTables.end(); for(OSQLTables::const_iterator aIter = aTables.begin(); aIter != aEnd;++aIter) aNames.push_back(aIter->first); @@ -749,7 +749,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) if ( !!m_aCurrentColumns[SelectColumns] ) return m_aCurrentColumns[SelectColumns]; - ::std::vector< OUString> aNames; + std::vector< OUString> aNames; ::rtl::Reference< OSQLColumns> aSelectColumns; bool bCase = true; Reference< XNameAccess> xQueryColumns; @@ -837,7 +837,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) } const ::comphelper::UStringMixEqual aCaseCompare( bCase ); - typedef ::std::set< size_t > SizeTSet; + typedef std::set< size_t > SizeTSet; SizeTSet aUsedSelectColumns; ::connectivity::parse::OParseColumn::StringMap aColumnNames; @@ -908,16 +908,16 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) OUString sRealName; xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; - ::std::vector< OUString>::const_iterator aFindName; + std::vector< OUString>::const_iterator aFindName; if ( sColumnName.isEmpty() ) xProp->getPropertyValue(PROPERTY_NAME) >>= sColumnName; - aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompare,sColumnName)); + aFindName = std::find_if(aNames.begin(),aNames.end(),std::bind2nd(aCaseCompare,sColumnName)); sal_Int32 j = 0; while ( aFindName != aNames.end() ) { sColumnName += OUString::number(++j); - aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompare,sColumnName)); + aFindName = std::find_if(aNames.begin(),aNames.end(),std::bind2nd(aCaseCompare,sColumnName)); } pColumn->setName(sColumnName); @@ -960,7 +960,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) } bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLParseTreeIterator& _rIterator, - ::std::vector< ::std::vector < PropertyValue > >& rFilters, const Reference< css::util::XNumberFormatter > & xFormatter) const + std::vector< std::vector < PropertyValue > >& rFilters, const Reference< css::util::XNumberFormatter > & xFormatter) const { // Round brackets around the expression if (pCondition->count() == 3 && @@ -982,7 +982,7 @@ bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLPa bResult = setORCriteria(pCondition->getChild(i), _rIterator, rFilters, xFormatter); else { - rFilters.push_back( ::std::vector < PropertyValue >()); + rFilters.push_back( std::vector < PropertyValue >()); bResult = setANDCriteria(pCondition->getChild(i), _rIterator, rFilters[rFilters.size() - 1], xFormatter); } } @@ -990,13 +990,13 @@ bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLPa } else { - rFilters.push_back(::std::vector < PropertyValue >()); + rFilters.push_back(std::vector < PropertyValue >()); return setANDCriteria(pCondition, _rIterator, rFilters[rFilters.size() - 1], xFormatter); } } bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition, - OSQLParseTreeIterator& _rIterator, ::std::vector < PropertyValue >& rFilter, const Reference< XNumberFormatter > & xFormatter) const + OSQLParseTreeIterator& _rIterator, std::vector < PropertyValue >& rFilter, const Reference< XNumberFormatter > & xFormatter) const { // Round brackets if (SQL_ISRULE(pCondition,boolean_primary)) @@ -1112,7 +1112,7 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica } bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCondition, OSQLParseTreeIterator& _rIterator, - ::std::vector < PropertyValue >& rFilter, const Reference< css::util::XNumberFormatter > & xFormatter) const + std::vector < PropertyValue >& rFilter, const Reference< css::util::XNumberFormatter > & xFormatter) const { OSL_ENSURE(SQL_ISRULE(pCondition, comparison_predicate),"setComparsionPredicate: pCondition is not a ComparsionPredicate"); if (SQL_ISRULE(pCondition->getChild(0), column_ref) || @@ -1334,7 +1334,7 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( ) if ( !m_aCurrentColumns[ParameterColumns] ) { ::rtl::Reference< OSQLColumns> aCols = m_aSqlIterator.getParameters(); - ::std::vector< OUString> aNames; + std::vector< OUString> aNames; OSQLColumns::Vector::const_iterator aEnd = aCols->get().end(); for(OSQLColumns::Vector::const_iterator aIter = aCols->get().begin(); aIter != aEnd;++aIter) aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME))); @@ -1357,8 +1357,8 @@ void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType ) void OSingleSelectQueryComposer::clearCurrentCollections() { - ::std::vector<OPrivateColumns*>::iterator aIter = m_aCurrentColumns.begin(); - ::std::vector<OPrivateColumns*>::const_iterator aEnd = m_aCurrentColumns.end(); + std::vector<OPrivateColumns*>::iterator aIter = m_aCurrentColumns.begin(); + std::vector<OPrivateColumns*>::const_iterator aEnd = m_aCurrentColumns.end(); for (;aIter != aEnd;++aIter) { if ( *aIter ) @@ -1386,7 +1386,7 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn // now set the group columns if ( !m_aCurrentColumns[_eType] ) { - ::std::vector< OUString> aNames; + std::vector< OUString> aNames; OSQLColumns::Vector::const_iterator aEnd = _rCols->get().end(); for(OSQLColumns::Vector::const_iterator aIter = _rCols->get().begin(); aIter != aEnd;++aIter) aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME))); @@ -1528,7 +1528,7 @@ void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Seque setHavingClause(lcl_getCondition(filter, aPredicateInput, getColumns(), m_xMetaData->getIdentifierQuoteString())); } -void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, bool andCriteria ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor,sal_Int32 filterOperator) +void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, bool andCriteria ,std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor,sal_Int32 filterOperator) { try { @@ -1756,7 +1756,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC #endif if ( pCondition ) { - ::std::vector< ::std::vector < PropertyValue > > aFilters; + std::vector< std::vector < PropertyValue > > aFilters; Reference< XNumberFormatter > xFormatter( NumberFormatter::create(m_aContext), UNO_QUERY_THROW ); xFormatter->attachNumberFormatsSupplier( m_xNumberFormatsSupplier ); @@ -1764,15 +1764,15 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC { aFilterSeq.realloc(aFilters.size()); Sequence<PropertyValue>* pFilters = aFilterSeq.getArray(); - ::std::vector< ::std::vector < PropertyValue > >::const_iterator aEnd = aFilters.end(); - ::std::vector< ::std::vector < PropertyValue > >::const_iterator i = aFilters.begin(); + std::vector< std::vector < PropertyValue > >::const_iterator aEnd = aFilters.end(); + std::vector< std::vector < PropertyValue > >::const_iterator i = aFilters.begin(); for ( ; i != aEnd ; ++i) { - const ::std::vector < PropertyValue >& rProperties = *i; + const std::vector < PropertyValue >& rProperties = *i; pFilters->realloc(rProperties.size()); PropertyValue* pFilter = pFilters->getArray(); - ::std::vector < PropertyValue >::const_iterator j = rProperties.begin(); - ::std::vector < PropertyValue >::const_iterator aEnd2 = rProperties.end(); + std::vector < PropertyValue >::const_iterator j = rProperties.begin(); + std::vector < PropertyValue >::const_iterator aEnd2 = rProperties.end(); for ( ; j != aEnd2 ; ++j) { *pFilter = *j; diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 267ca0527967..fa6a6d2f59e0 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -549,7 +549,7 @@ void ODBTableDecorator::refreshColumns() ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); - ::std::vector< OUString> aVector; + std::vector< OUString> aVector; Reference<XNameAccess> xNames; if(m_xTable.is()) diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 024ea15608e4..443fd1d6e320 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -86,7 +86,7 @@ namespace dbaccess Type aAlterType = cppu::UnoType<XAlterView>::get(); Sequence< Type > aTypes( ::comphelper::concatSequences(View_Base::getTypes(),View_IBASE::getTypes()) ); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pIter = aTypes.getConstArray(); diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index cab05f9f9f63..292689f83b1c 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -145,7 +145,7 @@ void OColumn::registerMayBeVoidProperty( const OUString& _rName, sal_Int32 _nHan OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - bool _bCaseSensitive,const ::std::vector< OUString> &_rVector, + bool _bCaseSensitive,const std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, bool _bAddColumn, @@ -164,7 +164,7 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const css::uno::Reference< css::container::XNameAccess >& _rxDrvColumns, - bool _bCaseSensitive,const ::std::vector< OUString> &_rVector, + bool _bCaseSensitive,const std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, bool _bAddColumn, diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index 477cd1cde9e6..572c6c2eebac 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -429,7 +429,7 @@ Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) const sal_Int32 nHaveAlways = 7; // Which optional properties are contained? - const sal_Int32 nHaveOptionally (::std::bitset<7>(nId).count()); + const sal_Int32 nHaveOptionally (std::bitset<7>(nId).count()); BEGIN_PROPERTY_SEQUENCE( nHaveAlways + nHaveOptionally ) diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 5874a33ea7eb..7a79ae4415f3 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -52,7 +52,7 @@ OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn, m_xAggregateAsParameters.set( m_xAggregateAsSet, UNO_QUERY_THROW ); Reference<XDatabaseMetaData> xMeta = _xConn->getMetaData(); - m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< OUString>(), nullptr,nullptr); + m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),std::vector< OUString>(), nullptr,nullptr); } OPreparedStatement::~OPreparedStatement() diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index d30bd602e7ac..dc70aa915e03 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -56,7 +56,7 @@ class OQuery :public OContentHelper friend struct TRelease; public: - typedef ::std::map< OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; + typedef std::map< OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; protected: // TNameColumnMap m_aColumnMap; // contains all columnnames to columns diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index 03f1b47901a9..d0560d2b63e4 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -156,7 +156,7 @@ OUString SAL_CALL OQueryComposer::getFilter( ) ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); MutexGuard aGuard(m_aMutex); FilterCreator aFilterCreator; - aFilterCreator = ::std::for_each(m_aFilters.begin(),m_aFilters.end(),aFilterCreator); + aFilterCreator = std::for_each(m_aFilters.begin(),m_aFilters.end(),aFilterCreator); return aFilterCreator.getComposedAndClear(); } @@ -174,7 +174,7 @@ OUString SAL_CALL OQueryComposer::getOrder( ) ::osl::MutexGuard aGuard( m_aMutex ); OrderCreator aOrderCreator; - aOrderCreator = ::std::for_each(m_aOrders.begin(),m_aOrders.end(),aOrderCreator); + aOrderCreator = std::for_each(m_aOrders.begin(),m_aOrders.end(),aOrderCreator); return aOrderCreator.getComposedAndClear(); } diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index a886d4a25c39..484beb34fb13 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -387,7 +387,7 @@ bool OQueryContainer::checkExistence(const OUString& _rName) Documents::const_iterator aFind = m_aDocumentMap.find(_rName); if ( !bRet && aFind != m_aDocumentMap.end() ) { - m_aDocuments.erase( ::std::find(m_aDocuments.begin(),m_aDocuments.end(),aFind)); + m_aDocuments.erase( std::find(m_aDocuments.begin(),m_aDocuments.end(),aFind)); m_aDocumentMap.erase(aFind); } else if ( bRet && aFind == m_aDocumentMap.end() ) diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 1f9c3a5ff25c..22d37b8177c5 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -121,14 +121,14 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWea :m_bColumnsOutOfDate(true) ,m_rMutex(_rMutex) { - m_pColumns = new OColumns(_rMySelf, m_rMutex, true,::std::vector< OUString>(), this,this); + m_pColumns = new OColumns(_rMySelf, m_rMutex, true,std::vector< OUString>(), this,this); } OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf) :m_bColumnsOutOfDate(true) ,m_rMutex(_rSource.m_rMutex) { - m_pColumns = new OColumns(_rMySelf, m_rMutex, true,::std::vector< OUString>(), this,this); + m_pColumns = new OColumns(_rMySelf, m_rMutex, true,std::vector< OUString>(), this,this); m_sCommand = _rSource.m_sCommand; m_bEscapeProcessing = _rSource.m_bEscapeProcessing; diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 330aa38fadcc..a8fe61e40fdc 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -61,7 +61,7 @@ OResultSet::OResultSet(const css::uno::Reference< css::sdbc::XResultSet >& _xRes ,m_nResultSetConcurrency(0) ,m_bIsBookmarkable(false) { - m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), nullptr,nullptr); + m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, std::vector< OUString>(), nullptr,nullptr); try { diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index a02c2f9b60b8..ab23f72a60aa 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -262,7 +262,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( ) Type aAlterType = cppu::UnoType<XAlterTable>::get(); Sequence< Type > aTypes(OTable_Base::getTypes()); - ::std::vector<Type> aOwnTypes; + std::vector<Type> aOwnTypes; aOwnTypes.reserve(aTypes.getLength()); const Type* pIter = aTypes.getConstArray(); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 485104be0c6d..92a3c4b97a19 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -198,7 +198,7 @@ Reference< XNameAccess> OComponentDefinition::getColumns() if ( !m_xColumns.is() ) { - ::std::vector< OUString> aNames; + std::vector< OUString> aNames; const OComponentDefinition_Impl& rDefinition( getDefinition() ); aNames.reserve( rDefinition.size() ); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 64a133a7a08d..784d4e4e1880 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -44,7 +44,7 @@ namespace dbaccess ,public ODataSettings_Base { public: - typedef ::std::map < OUString + typedef std::map < OUString , css::uno::Reference< css::beans::XPropertySet > > Columns; typedef Columns::iterator iterator; diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 7afe82f5396a..59b1e886e7fd 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -499,7 +499,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent } typedef Sequence< PropertyChangeEvent > PropertyEventSequence; - typedef ::std::map< XPropertiesChangeListener*, PropertyEventSequence* > PropertiesEventListenerMap; + typedef std::map< XPropertiesChangeListener*, PropertyEventSequence* > PropertiesEventListenerMap; PropertiesEventListenerMap aListeners; const PropertyChangeEvent* propertyChangeEvent = evt.getConstArray(); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 726fb7e1441c..f7bf18bcf43e 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -111,7 +111,7 @@ bool VosMutexFacade::tryToAcquire() class DocumentStorageAccess : public ::cppu::WeakImplHelper< XDocumentSubStorageSupplier , XTransactionListener > { - typedef ::std::map< OUString, Reference< XStorage > > NamedStorages; + typedef std::map< OUString, Reference< XStorage > > NamedStorages; ::osl::Mutex m_aMutex; /// all sub storages which we ever gave to the outer world @@ -320,7 +320,7 @@ Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames if ( !xRootStor.is() ) return Sequence< OUString >(); - ::std::vector< OUString > aNames; + std::vector< OUString > aNames; Sequence< OUString > aElementNames( xRootStor->getElementNames() ); for ( sal_Int32 i=0; i<aElementNames.getLength(); ++i ) @@ -609,7 +609,7 @@ bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContai void ODatabaseModelImpl::reset() { m_bReadOnly = false; - ::std::vector< TContentPtr > aEmptyContainers( 4 ); + std::vector< TContentPtr > aEmptyContainers( 4 ); m_aContainer.swap( aEmptyContainers ); if ( m_pStorageAccess.is() ) @@ -695,8 +695,8 @@ void ODatabaseModelImpl::dispose() m_xDataSource = WeakReference<XDataSource>(); m_xModel = WeakReference< XModel >(); - ::std::vector<TContentPtr>::const_iterator aIter = m_aContainer.begin(); - ::std::vector<TContentPtr>::const_iterator aEnd = m_aContainer.end(); + std::vector<TContentPtr>::const_iterator aIter = m_aContainer.begin(); + std::vector<TContentPtr>::const_iterator aEnd = m_aContainer.end(); for (;aIter != aEnd ; ++aIter) { if ( aIter->get() ) diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index fb02e0ed6fcb..bd56e902571b 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -174,7 +174,7 @@ private: rtl::Reference<DocumentStorageAccess> m_pStorageAccess; ::comphelper::SharedMutex m_aMutex; VosMutexFacade m_aMutexFacade; - ::std::vector< TContentPtr > m_aContainer; // one for each ObjectType + std::vector< TContentPtr > m_aContainer; // one for each ObjectType ::sfx2::DocumentMacroMode m_aMacroMode; sal_Int16 m_nImposedMacroExecMode; diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 3cb9a0dd7526..33267c063358 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -381,19 +381,19 @@ void SAL_CALL OConnection::clearWarnings( ) namespace { - struct CompareTypeByName : public ::std::binary_function< Type, Type, bool > + struct CompareTypeByName : public std::binary_function< Type, Type, bool > { bool operator() ( const Type& _rLHS, const Type& _rRHS ) const { return _rLHS.getTypeName() < _rRHS.getTypeName(); } }; - typedef ::std::set< Type, CompareTypeByName > TypeBag; + typedef std::set< Type, CompareTypeByName > TypeBag; void lcl_copyTypes( TypeBag& _out_rTypes, const Sequence< Type >& _rTypes ) { - ::std::copy( _rTypes.begin(), _rTypes.end(), - ::std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) ); + std::copy( _rTypes.begin(), _rTypes.end(), + std::insert_iterator< TypeBag >( _out_rTypes, _out_rTypes.begin() ) ); } } @@ -768,7 +768,7 @@ void OConnection::impl_checkTableQueryNames_nothrow() { Reference< XNameAccess > xTables( getTables() ); Sequence< OUString > aTableNames( xTables->getElementNames() ); - ::std::set< OUString > aSortedTableNames( aTableNames.getConstArray(), aTableNames.getConstArray() + aTableNames.getLength() ); + std::set< OUString > aSortedTableNames( aTableNames.getConstArray(), aTableNames.getConstArray() + aTableNames.getLength() ); Reference< XNameAccess > xQueries( getQueries() ); Sequence< OUString > aQueryNames( xQueries->getElementNames() ); diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index febaf9cf561f..52367d4ed01d 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -99,7 +99,7 @@ namespace dbaccess { private: Reference< XDesktop2 > m_xDesktop; - ::std::list< const ODatabaseModelImpl* > m_aDatabaseDocuments; + std::list< const ODatabaseModelImpl* > m_aDatabaseDocuments; public: explicit DatabaseDocumentLoader( const Reference<XComponentContext> & rxContext); @@ -134,7 +134,7 @@ namespace dbaccess void SAL_CALL DatabaseDocumentLoader::queryTermination( const lang::EventObject& /*Event*/ ) { - ::std::list< const ODatabaseModelImpl* > aCpy(m_aDatabaseDocuments); + std::list< const ODatabaseModelImpl* > aCpy(m_aDatabaseDocuments); for( const auto& pCopy : aCpy ) { try diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index e69abd70d4ca..3ecc3a38bba0 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -244,22 +244,22 @@ Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) // strip XEmbeddedScripts, and immediately re-assign to aTypes aTypes = Sequence< Type >( pStripTo, - ::std::remove_copy_if( + std::remove_copy_if( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), pStripTo, - ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XEmbeddedScripts>::get() ) + std::bind2nd( std::equal_to< Type >(), cppu::UnoType<XEmbeddedScripts>::get() ) ) - pStripTo ); // strip XScriptInvocationContext, and immediately re-assign to aTypes aTypes = Sequence< Type >( pStripTo, - ::std::remove_copy_if( + std::remove_copy_if( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), pStripTo, - ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() ) + std::bind2nd( std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() ) ) - pStripTo ); } @@ -858,7 +858,7 @@ void SAL_CALL ODatabaseDocument::disconnectController( const Reference< XControl { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); - Controllers::iterator pos = ::std::find( m_aControllers.begin(), m_aControllers.end(), _xController ); + Controllers::iterator pos = std::find( m_aControllers.begin(), m_aControllers.end(), _xController ); OSL_ENSURE( pos != m_aControllers.end(), "ODatabaseDocument::disconnectController: don't know this controller!" ); if ( pos != m_aControllers.end() ) { @@ -1812,7 +1812,7 @@ void ODatabaseDocument::disposing() // case they will be deleted - if they're C++ implementations, that is :). // Some of those implementations are offending enough to require the SolarMutex, which // means we should not release the last reference while our own mutex is locked ... - ::std::list< Reference< XInterface > > aKeepAlive; + std::list< Reference< XInterface > > aKeepAlive; // SYNCHRONIZED -> ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -2035,7 +2035,7 @@ Reference< XInterface > ODatabaseDocument::getThis() const return *const_cast< ODatabaseDocument* >( this ); } -struct CreateAny : public ::std::unary_function< Reference<XController>, Any> +struct CreateAny : public std::unary_function< Reference<XController>, Any> { Any operator() (const Reference<XController>& lhs) const { @@ -2048,7 +2048,7 @@ Reference< XEnumeration > SAL_CALL ODatabaseDocument::getControllers( ) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); uno::Sequence< Any> aController( m_aControllers.size() ); - ::std::transform( m_aControllers.begin(), m_aControllers.end(), aController.getArray(), CreateAny() ); + std::transform( m_aControllers.begin(), m_aControllers.end(), aController.getArray(), CreateAny() ); return new ::comphelper::OAnyEnumeration(aController); } diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 80bd42913c61..66a87e766d94 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -70,7 +70,7 @@ class DocumentEvents; class DocumentEventExecutor; class DocumentGuard; -typedef ::std::vector< css::uno::Reference< css::frame::XController > > Controllers; +typedef std::vector< css::uno::Reference< css::frame::XController > > Controllers; // ViewMonitor /** helper class monitoring the views of a document, and firing appropriate events diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 76bf0882b269..3c1a828f5bba 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -275,7 +275,7 @@ class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener > } TConnectionHolder; // the less-compare functor, used for the stl::map - 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 { @@ -286,8 +286,8 @@ class OSharedConnectionManager : public ::cppu::WeakImplHelper< XEventListener > } }; - typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections - typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections + typedef std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections + typedef std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections ::osl::Mutex m_aMutex; TConnectionMap m_aConnections; // remember the master connection in conjunction with the digest @@ -404,7 +404,7 @@ namespace const PropertyValue* pDataSourceSetting = _rDataSourceSettings.getConstArray(); const PropertyValue* pEnd = pDataSourceSetting + _rDataSourceSettings.getLength(); - ::std::vector< PropertyValue > aRet; + std::vector< PropertyValue > aRet; for ( ; pDataSourceSetting != pEnd ; ++pDataSourceSetting ) { @@ -440,9 +440,9 @@ namespace return Sequence< PropertyValue >(); } - typedef ::std::map< OUString, sal_Int32 > PropertyAttributeCache; + typedef std::map< OUString, sal_Int32 > PropertyAttributeCache; - struct IsDefaultAndNotRemoveable : public ::std::unary_function< PropertyValue, bool > + struct IsDefaultAndNotRemoveable : public std::unary_function< PropertyValue, bool > { private: const PropertyAttributeCache& m_rAttribs; @@ -796,7 +796,7 @@ sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & namespace { - struct SelectPropertyName : public ::std::unary_function< PropertyValue, OUString > + struct SelectPropertyName : public std::unary_function< PropertyValue, OUString > { public: const OUString& operator()( const PropertyValue& _lhs ) @@ -821,12 +821,12 @@ namespace void lcl_setPropertyValues_resetOrRemoveOther( const Reference< XPropertyBag >& _rxPropertyBag, const Sequence< PropertyValue >& _rAllNewPropertyValues ) { // sequences are ugly to operate on - typedef ::std::set< OUString > StringSet; + typedef std::set< OUString > StringSet; StringSet aToBeSetPropertyNames; - ::std::transform( + std::transform( _rAllNewPropertyValues.getConstArray(), _rAllNewPropertyValues.getConstArray() + _rAllNewPropertyValues.getLength(), - ::std::insert_iterator< StringSet >( aToBeSetPropertyNames, aToBeSetPropertyNames.end() ), + std::insert_iterator< StringSet >( aToBeSetPropertyNames, aToBeSetPropertyNames.end() ), SelectPropertyName() ); @@ -943,7 +943,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con Reference< XPropertySet > xSettingsAsProps( m_pImpl->m_xSettings, UNO_QUERY_THROW ); Reference< XPropertySetInfo > xPST( xSettingsAsProps->getPropertySetInfo(), UNO_QUERY_THROW ); Sequence< Property > aSettings( xPST->getProperties() ); - ::std::map< OUString, sal_Int32 > aPropertyAttributes; + std::map< OUString, sal_Int32 > aPropertyAttributes; for ( const Property* pSettings = aSettings.getConstArray(); pSettings != aSettings.getConstArray() + aSettings.getLength(); ++pSettings @@ -958,7 +958,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con // transform them so that only property values which fulfill certain // criteria survive Sequence< PropertyValue > aNonDefaultOrUserDefined( aValues.getLength() ); - const PropertyValue* pCopyEnd = ::std::remove_copy_if( + const PropertyValue* pCopyEnd = std::remove_copy_if( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(), aNonDefaultOrUserDefined.getArray(), diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 02e924829421..ec1f266dca92 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -63,7 +63,7 @@ void ODefinitionContainer_Impl::erase( const TContentPtr& _pDefinition ) ODefinitionContainer_Impl::const_iterator ODefinitionContainer_Impl::find( const TContentPtr& _pDefinition ) const { - return ::std::find_if( + return std::find_if( m_aDefinitions.begin(), m_aDefinitions.end(), [&_pDefinition] (const NamedDefinitions::value_type& namedDef) { @@ -73,7 +73,7 @@ ODefinitionContainer_Impl::const_iterator ODefinitionContainer_Impl::find( const ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( const TContentPtr& _pDefinition ) { - return ::std::find_if( + return std::find_if( m_aDefinitions.begin(), m_aDefinitions.end(), [&_pDefinition] (const NamedDefinitions::value_type& namedDef) { @@ -472,7 +472,7 @@ void ODefinitionContainer::implRemove(const OUString& _rName) Documents::const_iterator aFind = m_aDocumentMap.find(_rName); if ( aFind != m_aDocumentMap.end() ) { - m_aDocuments.erase( ::std::find(m_aDocuments.begin(),m_aDocuments.end(),aFind)); + m_aDocuments.erase( std::find(m_aDocuments.begin(),m_aDocuments.end(),aFind)); m_aDocumentMap.erase(aFind); getDefinitions().erase( _rName ); diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx index f60be3bd7aba..429d3d93c5aa 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx @@ -54,7 +54,7 @@ namespace dbaccess virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: - ::std::unique_ptr< DocumentEventExecutor_Data > m_pData; + std::unique_ptr< DocumentEventExecutor_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx index aca027e159d9..e188c4f9b2c8 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx @@ -50,7 +50,7 @@ namespace dbaccess ::osl::Mutex& m_rMutex; bool m_bInitialized; bool m_bDisposed; - ::std::shared_ptr<::comphelper::AsyncEventNotifierAutoJoin> m_pEventBroadcaster; + std::shared_ptr<::comphelper::AsyncEventNotifierAutoJoin> m_pEventBroadcaster; ::comphelper::OInterfaceContainerHelper2 m_aLegacyEventListeners; ::comphelper::OInterfaceContainerHelper2 m_aDocumentEventListeners; diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index dc2ab8ac5f85..8db1f8c3e25b 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -31,7 +31,7 @@ namespace dbaccess { - typedef ::std::map< OUString, css::uno::Sequence< css::beans::PropertyValue > > + typedef std::map< OUString, css::uno::Sequence< css::beans::PropertyValue > > DocumentEventsData; // DocumentEvents @@ -68,7 +68,7 @@ namespace dbaccess virtual sal_Bool SAL_CALL hasElements( ) override; private: - ::std::unique_ptr< DocumentEvents_Data > m_pData; + std::unique_ptr< DocumentEvents_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index c2e431d8c799..8806371d1dbc 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -31,7 +31,7 @@ struct DataSupplier_Impl; class DataSupplier : public ucbhelper::ResultSetDataSupplier { - ::std::unique_ptr<DataSupplier_Impl> m_pImpl; + std::unique_ptr<DataSupplier_Impl> m_pImpl; public: explicit DataSupplier( const rtl::Reference< ODocumentContainer >& rxContent ); diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 27bb127b4dad..af6f98cf5b12 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -40,7 +40,7 @@ namespace dbaccess { private: typedef ::rtl::Reference< OPropertyForward > TPropertyForward; - typedef ::std::map< OUString, TPropertyForward > PropertyForwardList; + typedef std::map< OUString, TPropertyForward > PropertyForwardList; PropertyForwardList m_aForwardList; css::uno::Reference< css::container::XNameAccess > m_xSettings; // can not be weak css::uno::Reference< css::container::XContainer > m_xContainer; // can not be weak diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 5f405d9e7cb3..b8d9c45d9d74 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -242,7 +242,7 @@ private: ::dbtools::ParameterManager m_aParameterManager; ::dbtools::FilterManager m_aFilterManager; - ::std::map< OUString, css::uno::Any> m_aNumberFormats; + std::map< OUString, css::uno::Any> m_aNumberFormats; css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::sdbc::XConnection > m_xActiveConnection; diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 9bb283e30819..68c4be4d6c26 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -52,7 +52,7 @@ namespace dbaccess OPropertyForward( const css::uno::Reference< css::beans::XPropertySet>& _xSource, const css::uno::Reference< css::container::XNameAccess>& _xDestContainer, const OUString& _sName, - const ::std::vector< OUString >& _aPropertyList + const std::vector< OUString >& _aPropertyList ); // css::beans::XPropertyChangeListener diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 4d7bd244247b..661f76e9a6f1 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -74,16 +74,16 @@ namespace dbaccess OrderColumns = 2, ParameterColumns = 3 }; - typedef ::std::const_mem_fun_t< const ::connectivity::OSQLParseNode*, ::connectivity::OSQLParseTreeIterator > + typedef std::const_mem_fun_t< const ::connectivity::OSQLParseNode*, ::connectivity::OSQLParseTreeIterator > TGetParseNode; ::svxform::OSystemParseContext m_aParseContext; ::connectivity::OSQLParser m_aSqlParser; ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement) - ::std::vector<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries - ::std::vector<OPrivateTables*> m_aTablesCollection; + std::vector<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries + std::vector<OPrivateTables*> m_aTablesCollection; - ::std::vector< OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement + std::vector< OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement css::uno::Reference< css::sdbc::XConnection> m_xConnection; css::uno::Reference< css::sdbc::XDatabaseMetaData> m_xMetaData; @@ -93,7 +93,7 @@ namespace dbaccess css::uno::Reference< css::uno::XComponentContext> m_aContext; css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter; - ::std::vector<OPrivateColumns*> m_aCurrentColumns; + std::vector<OPrivateColumns*> m_aCurrentColumns; OPrivateTables* m_pTables; // currently used tables OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having @@ -109,11 +109,11 @@ namespace dbaccess bool setORCriteria(::connectivity::OSQLParseNode* pCondition, ::connectivity::OSQLParseTreeIterator& _rIterator, - ::std::vector< ::std::vector < css::beans::PropertyValue > >& rFilters, const css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const; + std::vector< std::vector < css::beans::PropertyValue > >& rFilters, const css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const; bool setANDCriteria(::connectivity::OSQLParseNode* pCondition, ::connectivity::OSQLParseTreeIterator& _rIterator, - ::std::vector < css::beans::PropertyValue > & rFilters, const css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const; + std::vector < css::beans::PropertyValue > & rFilters, const css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const; bool setComparsionPredicate(::connectivity::OSQLParseNode* pCondition, ::connectivity::OSQLParseTreeIterator& _rIterator, - ::std::vector < css::beans::PropertyValue > & rFilters, const css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const; + std::vector < css::beans::PropertyValue > & rFilters, const css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const; static OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator); OUString getTableAlias(const css::uno::Reference< css::beans::XPropertySet >& column ) const; @@ -132,7 +132,7 @@ namespace dbaccess void setConditionByColumn( const css::uno::Reference< css::beans::XPropertySet >& column , bool andCriteria - ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor + ,std::mem_fun1_t<bool,OSingleSelectQueryComposer,const OUString& >& _aSetFunctor ,sal_Int32 filterOperator); /** getStructuredCondition returns the structured condition for the where or having clause @@ -175,7 +175,7 @@ namespace dbaccess /** composes a statement from m_aPureSelectSQL and the 4 usual clauses */ - OUString composeStatementFromParts( const ::std::vector< OUString >& _rParts ); + OUString composeStatementFromParts( const std::vector< OUString >& _rParts ); /** return the name of the column in the *source* *table*. diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index 37856c0e32ce..85305743e475 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -188,7 +188,7 @@ namespace dbaccess ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, bool _bCaseSensitive, - const ::std::vector< OUString>& _rVector, + const std::vector< OUString>& _rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, bool _bAddColumn = false, @@ -200,7 +200,7 @@ namespace dbaccess ::osl::Mutex& _rMutex, const css::uno::Reference< css::container::XNameAccess >& _rxDrvColumns, bool _bCaseSensitive, - const ::std::vector< OUString> &_rVector, + const std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, bool _bAddColumn = false, diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index b1187830cca8..70fb50fcb934 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -29,7 +29,7 @@ namespace dbaccess { // TokenComposer - struct TokenComposer : public ::std::unary_function< OUString, void > + struct TokenComposer : public std::unary_function< OUString, void > { private: #ifdef DBG_UTIL diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 614a8023de65..472bc2f4a076 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -50,7 +50,7 @@ namespace dbaccess class ODefinitionContainer_Impl : public OContentHelper_Impl { public: - typedef ::std::map< OUString, TContentPtr > NamedDefinitions; + typedef std::map< OUString, TContentPtr > NamedDefinitions; typedef NamedDefinitions::iterator iterator; typedef NamedDefinitions::const_iterator const_iterator; diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index 45f14dd6434c..4fceb65ede1c 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -40,7 +40,7 @@ namespace dbaccess */ class ObjectNameApproval : public IContainerApprove { - ::std::unique_ptr< ObjectNameApproval_Impl > m_pImpl; + std::unique_ptr< ObjectNameApproval_Impl > m_pImpl; public: enum ObjectType diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 2271cb408e34..1bf5694c2d5d 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -46,8 +46,8 @@ namespace dbaccess public OSubComponent, public OQueryComposer_BASE { - ::std::vector< OUString> m_aFilters; - ::std::vector< OUString> m_aOrders; + std::vector< OUString> m_aFilters; + std::vector< OUString> m_aOrders; OUString m_sOrgFilter; OUString m_sOrgOrder; css::uno::Reference< css::sdb::XSingleSelectQueryComposer> m_xComposer; diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx index a903c29a1b04..c98baf9253cf 100644 --- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx +++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx @@ -50,7 +50,7 @@ namespace dbaccess */ void saveModifiedSubComponents( const css::uno::Reference< css::embed::XStorage >& i_rTargetStorage, - const ::std::vector< css::uno::Reference< css::frame::XController > >& i_rControllers + const std::vector< css::uno::Reference< css::frame::XController > >& i_rControllers ); /** recovery sub components from the given document storage, if applicable @@ -66,7 +66,7 @@ namespace dbaccess ); private: - const ::std::unique_ptr< DatabaseDocumentRecovery_Data > m_pData; + const std::unique_ptr< DatabaseDocumentRecovery_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index 8490f3d288a6..a803a7d87b68 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -202,7 +202,7 @@ void OContainerMediator::notifyElementCreated( const OUString& _sName, const Ref return; } - ::std::vector< OUString > aPropertyList; + std::vector< OUString > aPropertyList; try { // initially copy from the settings object (if existent) to the newly created object diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index 21bbac3bd3f5..0a42060403e8 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -280,7 +280,7 @@ sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationP uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const { - ::std::map< OUString,css::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation); + std::map< OUString,css::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation); if ( aFind != m_aNumberFormats.end() ) return aFind->second; return uno::makeAny(sal_Int32(0)); @@ -635,7 +635,7 @@ namespace } }; - struct CreateColumnDescription : public ::std::unary_function< OUString, ColumnDescription > + struct CreateColumnDescription : public std::unary_function< OUString, ColumnDescription > { ColumnDescription operator()( const OUString& i_rName ) { @@ -643,7 +643,7 @@ namespace } }; - struct SelectColumnName : public ::std::unary_function< ColumnDescription, OUString > + struct SelectColumnName : public std::unary_function< ColumnDescription, OUString > { const OUString& operator()( const ColumnDescription& i_rColumn ) { @@ -659,7 +659,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(bool _bHasCategor uno::Reference< container::XNameAccess > xColumns( xColSup->getColumns(), uno::UNO_SET_THROW ); const uno::Sequence< OUString > aRowSetColumnNames( xColumns->getElementNames() ); - typedef ::std::vector< ColumnDescription > ColumnDescriptions; + typedef std::vector< ColumnDescription > ColumnDescriptions; ColumnDescriptions aColumns; bool bFirstColumnIsCategory = _bHasCategories; if ( i_aColumnNames.getLength() ) @@ -711,7 +711,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(bool _bHasCategor if ( aColumns.empty() ) { aColumns.resize( aRowSetColumnNames.getLength() ); - ::std::transform( + std::transform( aRowSetColumnNames.getConstArray(), aRowSetColumnNames.getConstArray() + aRowSetColumnNames.getLength(), aColumns.begin(), @@ -739,11 +739,11 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(bool _bHasCategor const sal_Int32 columnIndex = col - aColumns.begin(); const OUString sRangeName = OUString::number( columnIndex ); - m_aNumberFormats.insert( ::std::map< OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) ); + m_aNumberFormats.insert( std::map< OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) ); } - ::std::vector< OUString > aRowLabels; - ::std::vector< ::std::vector< double > > aDataValues; + std::vector< OUString > aRowLabels; + std::vector< std::vector< double > > aDataValues; sal_Int32 nRowCount = 0; ::connectivity::ORowSetValue aValue; while( xRes->next() && (!m_RowLimit || nRowCount < m_RowLimit) ) @@ -753,7 +753,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(bool _bHasCategor aValue.fill( aColumns[0].nResultSetPosition, aColumns[0].nDataType, xRow ); aRowLabels.push_back( aValue.getString() ); - ::std::vector< double > aRow; + std::vector< double > aRow; for ( ColumnDescriptions::const_iterator col = aColumns.begin(); col != aColumns.end(); ++col @@ -788,7 +788,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(bool _bHasCategor for(sal_Int32 h = 0,k = 0; h < nRowCount; ++h,++k ) { aRowLabels.push_back(OUString::number(h+1)); - ::std::vector< double > aRow; + std::vector< double > aRow; const sal_Int32 nSize = SAL_N_ELEMENTS(fDefaultData); for (size_t j = 0; j < (aColumns.size()-1); ++j,++k) { @@ -805,7 +805,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(bool _bHasCategor const size_t nOffset = bFirstColumnIsCategory ? 1 : 0; uno::Sequence< OUString > aColumnDescriptions( aColumns.size() - nOffset ); - ::std::transform( + std::transform( aColumns.begin() + nOffset, aColumns.end(), aColumnDescriptions.getArray(), diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index c128c2e1f6b6..95cabf09220c 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -39,7 +39,7 @@ namespace dbaccess OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer, - const OUString& _sName, const ::std::vector< OUString>& _aPropertyList ) + const OUString& _sName, const std::vector< OUString>& _aPropertyList ) :m_xSource( _xSource, UNO_SET_THROW ) ,m_xDestContainer( _xDestContainer, UNO_SET_THROW ) ,m_sName( _sName ) @@ -53,8 +53,8 @@ namespace dbaccess _xSource->addPropertyChangeListener( OUString(), this ); else { - ::std::vector< OUString >::const_iterator aIter = _aPropertyList.begin(); - ::std::vector< OUString >::const_iterator aEnd = _aPropertyList.end(); + std::vector< OUString >::const_iterator aIter = _aPropertyList.begin(); + std::vector< OUString >::const_iterator aEnd = _aPropertyList.end(); for (; aIter != aEnd ; ++aIter ) _xSource->addPropertyChangeListener( *aIter, this ); } diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 5aabdd7620ef..57a8ee775501 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -421,7 +421,7 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const return DST_UNKNOWN; } -void ODsnTypeCollection::fillPageIds(const OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const +void ODsnTypeCollection::fillPageIds(const OUString& _sURL,std::vector<sal_Int16>& _rOutPathIds) const { DATASOURCE_TYPE eType = determineType(_sURL); switch(eType) diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index a19fb26b008c..31068a852ad7 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -222,7 +222,7 @@ namespace dbaccess } void DatabaseDocumentRecovery::saveModifiedSubComponents( const Reference< XStorage >& i_rTargetStorage, - const ::std::vector< Reference< XController > >& i_rControllers ) + const std::vector< Reference< XController > >& i_rControllers ) { ENSURE_OR_THROW( i_rTargetStorage.is(), "invalid document storage" ); @@ -242,7 +242,7 @@ namespace dbaccess MapCompTypeToCompDescs aMapCompDescs; - for ( ::std::vector< Reference< XController > >::const_iterator ctrl = i_rControllers.begin(); + for ( std::vector< Reference< XController > >::const_iterator ctrl = i_rControllers.begin(); ctrl != i_rControllers.end(); ++ctrl ) diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 30080e33b393..1bbcc58c8403 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -43,7 +43,7 @@ namespace dbaccess void writeLine(); private: - ::std::unique_ptr< StorageTextOutputStream_Data > m_pData; + std::unique_ptr< StorageTextOutputStream_Data > m_pData; }; } // namespace dbaccess diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index bafa405c63a3..6d0332eee2bd 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -48,7 +48,7 @@ namespace dbaccess struct StorageXMLOutputStream_Data { Reference< XDocumentHandler > xHandler; - ::std::stack< OUString > aElements; + std::stack< OUString > aElements; ::rtl::Reference< SvXMLAttributeList > xAttributes; }; diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index 6f4876a26f27..a4f9a2a4c871 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -59,7 +59,7 @@ namespace dbaccess StorageXMLOutputStream& operator=( const StorageXMLOutputStream& ) = delete; private: - ::std::unique_ptr< StorageXMLOutputStream_Data > m_pData; + std::unique_ptr< StorageXMLOutputStream_Data > m_pData; }; class StorageXMLInputStream diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index 7e43408bc6f1..c93248e5d18a 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -264,7 +264,7 @@ namespace dbaccess const ::comphelper::NamedValueCollection& getSettings() const { return m_aSettings; } private: - ::std::stack< ::rtl::Reference< SettingsImport > > m_aStates; + std::stack< ::rtl::Reference< SettingsImport > > m_aStates; ::comphelper::NamedValueCollection m_aSettings; }; diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx index f72b10556a14..e9ecb04bb8cf 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.hxx +++ b/dbaccess/source/ext/macromigration/docinteraction.hxx @@ -70,7 +70,7 @@ namespace dbmm ); private: - ::std::unique_ptr< InteractionHandler_Data > m_pData; + std::unique_ptr< InteractionHandler_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index eb840335c061..6637bb32f49c 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -85,7 +85,7 @@ namespace dbmm // helper static void lcl_getControllers_throw(const Reference< XModel2 >& _rxDocument, - ::std::list< Reference< XController2 > >& _out_rControllers ) + std::list< Reference< XController2 > >& _out_rControllers ) { _out_rControllers.clear(); Reference< XEnumeration > xControllerEnum( _rxDocument->getControllers(), UNO_SET_THROW ); @@ -308,11 +308,11 @@ namespace dbmm try { // collect all controllers of our document - ::std::list< Reference< XController2 > > aControllers; + std::list< Reference< XController2 > > aControllers; lcl_getControllers_throw( m_pData->xDocumentModel, aControllers ); // close all sub documents of all controllers - for ( ::std::list< Reference< XController2 > >::const_iterator pos = aControllers.begin(); + for ( std::list< Reference< XController2 > >::const_iterator pos = aControllers.begin(); pos != aControllers.end() && bSuccess; ++pos ) @@ -419,8 +419,8 @@ namespace dbmm void MacroMigrationDialog::impl_reloadDocument_nothrow( bool _bMigrationSuccess ) { - typedef ::std::pair< Reference< XFrame >, OUString > ViewDescriptor; - ::std::list< ViewDescriptor > aViews; + typedef std::pair< Reference< XFrame >, OUString > ViewDescriptor; + std::list< ViewDescriptor > aViews; try { @@ -446,7 +446,7 @@ namespace dbmm aDocumentArgs.remove( "URL" ); // collect all controllers of our document - ::std::list< Reference< XController2 > > aControllers; + std::list< Reference< XController2 > > aControllers; lcl_getControllers_throw( m_pData->xDocumentModel, aControllers ); // close all those controllers diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index 3c21c0888a6e..742b152e6a0e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -65,7 +65,7 @@ namespace dbmm DECL_LINK( OnStartMigration, void*, void ); private: - ::std::unique_ptr< MacroMigrationDialog_Data > m_pData; + std::unique_ptr< MacroMigrationDialog_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 0a25424f0327..ab16c655765d 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -148,7 +148,7 @@ namespace dbmm } }; - typedef ::std::vector< SubDocument > SubDocuments; + typedef std::vector< SubDocument > SubDocuments; // helper typedef ::utl::SharedUNOComponent< XStorage > SharedStorage; @@ -564,7 +564,7 @@ namespace dbmm /** returns the names of the elements in the "Scripts" storage */ - ::std::set< OUString > + std::set< OUString > getElementNames() const; /** removes the sub storage for a given script type @@ -667,17 +667,17 @@ namespace dbmm return xStorage; } - ::std::set< OUString > ScriptsStorage::getElementNames() const + std::set< OUString > ScriptsStorage::getElementNames() const { Sequence< OUString > aElementNames; if ( isValid() ) aElementNames = m_xScriptsStorage->getElementNames(); - ::std::set< OUString > aNames; - ::std::copy( + std::set< OUString > aNames; + std::copy( aElementNames.getConstArray(), aElementNames.getConstArray() + aElementNames.getLength(), - ::std::insert_iterator< ::std::set< OUString > >( aNames, aNames.end() ) + std::insert_iterator< std::set< OUString > >( aNames, aNames.end() ) ); return aNames; } @@ -1180,7 +1180,7 @@ namespace dbmm { // no scripts at all, or no scripts of the given type return !m_rLogger.hadFailure(); } - ::std::set< OUString > aElementNames( aDocStorage.getElementNames() ); + std::set< OUString > aElementNames( aDocStorage.getElementNames() ); const ScriptType aKnownStorageBasedTypes[] = { eBeanShell, eJavaScript, ePython, eJava diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx index 0ecf64e12a33..b5a2c023a369 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.hxx +++ b/dbaccess/source/ext/macromigration/migrationengine.hxx @@ -70,7 +70,7 @@ namespace dbmm bool migrateAll(); private: - ::std::unique_ptr< MigrationEngine_Impl > m_pImpl; + std::unique_ptr< MigrationEngine_Impl > m_pImpl; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx index 00be94df94be..0de6162d0cde 100644 --- a/dbaccess/source/ext/macromigration/migrationerror.hxx +++ b/dbaccess/source/ext/macromigration/migrationerror.hxx @@ -62,7 +62,7 @@ namespace dbmm struct MigrationError { const MigrationErrorType eType; - ::std::vector< OUString > aErrorDetails; + std::vector< OUString > aErrorDetails; const css::uno::Any aCaughtException; MigrationError( diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index e28ce2b78949..4941b4f82a66 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -52,7 +52,7 @@ namespace dbmm { SubDocumentType eType; OUString sName; - ::std::vector< LibraryEntry > aMovedLibraries; + std::vector< LibraryEntry > aMovedLibraries; DocumentEntry() :eType( eForm ) @@ -69,10 +69,10 @@ namespace dbmm }; // DocumentLogs - typedef ::std::map< DocumentID, DocumentEntry > DocumentLogs; + typedef std::map< DocumentID, DocumentEntry > DocumentLogs; // ErrorLog - typedef ::std::list< MigrationError > ErrorLog; + typedef std::list< MigrationError > ErrorLog; // MigrationLog_Data struct MigrationLog_Data @@ -169,7 +169,7 @@ namespace dbmm } const DocumentEntry& rDocEntry( docPos->second ); - for ( ::std::vector< LibraryEntry >::const_iterator lib = rDocEntry.aMovedLibraries.begin(); + for ( std::vector< LibraryEntry >::const_iterator lib = rDocEntry.aMovedLibraries.begin(); lib != rDocEntry.aMovedLibraries.end(); ++lib ) @@ -189,7 +189,7 @@ namespace dbmm void lcl_appendErrorDescription( OUStringBuffer& _inout_rBuffer, const MigrationError& _rError ) { const sal_Char* pAsciiErrorDescription( nullptr ); - ::std::vector< OUString > aParameterNames; + std::vector< OUString > aParameterNames; switch ( _rError.eType ) { case ERR_OPENING_SUB_DOCUMENT_FAILED: @@ -334,7 +334,7 @@ namespace dbmm OSL_ENSURE( aParameterNames.size() == _rError.aErrorDetails.size(), "lcl_appendErrorDescription: unexpected number of error message parameters!" ); - for ( size_t i=0; i < ::std::min( aParameterNames.size(), _rError.aErrorDetails.size() ); ++i ) + for ( size_t i=0; i < std::min( aParameterNames.size(), _rError.aErrorDetails.size() ); ++i ) { sSubstituted = sSubstituted.replaceFirst( aParameterNames[i], _rError.aErrorDetails[i]); @@ -421,7 +421,7 @@ namespace dbmm aBuffer.append( "=== " + sDocTitle + " ===\n" ); - for ( ::std::vector< LibraryEntry >::const_iterator lib = rDoc.aMovedLibraries.begin(); + for ( std::vector< LibraryEntry >::const_iterator lib = rDoc.aMovedLibraries.begin(); lib != rDoc.aMovedLibraries.end(); ++lib ) diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx index 1a854e6e89f6..85adba176097 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.hxx +++ b/dbaccess/source/ext/macromigration/migrationlog.hxx @@ -101,7 +101,7 @@ namespace dbmm getCompleteLog() const; private: - ::std::unique_ptr< MigrationLog_Data > m_pData; + std::unique_ptr< MigrationLog_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx index 17cffd514eb0..8cbb2144802c 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.hxx +++ b/dbaccess/source/ext/macromigration/progresscapture.hxx @@ -55,7 +55,7 @@ namespace dbmm virtual ~ProgressCapture() override; private: - ::std::unique_ptr< ProgressCapture_Data > m_pData; + std::unique_ptr< ProgressCapture_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index 40030feca0e6..4fd482c6cb1b 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.cxx +++ b/dbaccess/source/ext/macromigration/progressmixer.cxx @@ -58,7 +58,7 @@ namespace dbmm } }; - typedef ::std::map< PhaseID, PhaseData > Phases; + typedef std::map< PhaseID, PhaseData > Phases; // ProgressMixer_Data struct ProgressMixer_Data diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx index 68db5655bc2e..171089380af1 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.hxx +++ b/dbaccess/source/ext/macromigration/progressmixer.hxx @@ -77,7 +77,7 @@ namespace dbmm void endPhase(); private: - ::std::unique_ptr< ProgressMixer_Data > m_pData; + std::unique_ptr< ProgressMixer_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index 2c1360f3c6ad..9e4fce628291 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx @@ -30,7 +30,7 @@ namespace dbaxml void OXMLAutoStylePoolP::exportStyleAttributes( SvXMLAttributeList& rAttrList, sal_Int32 nFamily, - const ::std::vector< XMLPropertyState >& rProperties, + const std::vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap @@ -40,8 +40,8 @@ void OXMLAutoStylePoolP::exportStyleAttributes( if ( nFamily == XML_STYLE_FAMILY_TABLE_COLUMN ) { rtl::Reference< XMLPropertySetMapper > aPropMapper = rODBExport.GetColumnStylesPropertySetMapper(); - ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); - ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); + std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); + std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); for ( ; i != aEnd ; ++i ) { sal_Int16 nContextID = aPropMapper->GetEntryContextId(i->mnIndex); diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx index 0445d9abc3cd..c8316cd7f1db 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx @@ -33,7 +33,7 @@ namespace dbaxml virtual void exportStyleAttributes( SvXMLAttributeList& rAttrList, sal_Int32 nFamily, - const ::std::vector< XMLPropertyState >& rProperties, + const std::vector< XMLPropertyState >& rProperties, const SvXMLExportPropertyMapper& rPropExp, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index 376dab7485da..c9abadae48ba 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -50,7 +50,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; bool bAutoEnabled = false; bool bFoundField = false,bFoundThousand = false, bFoundCharset = false; - ::std::vector< sal_uInt16 > aTokens; + std::vector< sal_uInt16 > aTokens; for(sal_Int16 i = 0; i < nLength; ++i) { OUString sLocalName; diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 4d69dafdb2b4..02b1e754874c 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -180,7 +180,7 @@ namespace dbaxml const XMLPropertyState& /*rProperty*/, const SvXMLUnitConverter& /*rUnitConverter*/, const SvXMLNamespaceMap& /*rNamespaceMap*/, - const ::std::vector< XMLPropertyState > * /*pProperties*/ , + const std::vector< XMLPropertyState > * /*pProperties*/ , sal_uInt32 /*nIdx*/ ) const override { // nothing to do here @@ -646,7 +646,7 @@ void ODBExport::exportConnectionData() } template< typename T > void ODBExport::exportDataSourceSettingsSequence( - ::std::vector< TypedPropertyValue >::iterator const & in) + std::vector< TypedPropertyValue >::iterator const & in) { OSequenceIterator< T > i( in->Value ); while (i.hasMoreElements()) @@ -663,8 +663,8 @@ void ODBExport::exportDataSourceSettings() return; SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, true, true); - ::std::vector< TypedPropertyValue >::iterator aIter = m_aDataSourceSettings.begin(); - ::std::vector< TypedPropertyValue >::const_iterator aEnd = m_aDataSourceSettings.end(); + std::vector< TypedPropertyValue >::iterator aIter = m_aDataSourceSettings.begin(); + std::vector< TypedPropertyValue >::const_iterator aEnd = m_aDataSourceSettings.end(); for ( ; aIter != aEnd; ++aIter ) { const bool bIsSequence = TypeClass_SEQUENCE == aIter->Type.getTypeClass(); @@ -1118,8 +1118,8 @@ void ODBExport::exportTables(bool _bExportContext) void ODBExport::exportAutoStyle(XPropertySet* _xProp) { - typedef ::std::pair<TPropertyStyleMap*,sal_uInt16> TEnumMapperPair; - typedef ::std::pair< rtl::Reference < SvXMLExportPropertyMapper> , TEnumMapperPair> TExportPropMapperPair; + typedef std::pair<TPropertyStyleMap*,sal_uInt16> TEnumMapperPair; + typedef std::pair< rtl::Reference < SvXMLExportPropertyMapper> , TEnumMapperPair> TExportPropMapperPair; Reference<XColumnsSupplier> xSup(_xProp,UNO_QUERY); if ( xSup.is() ) { @@ -1129,7 +1129,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) ,TExportPropMapperPair(m_xRowExportHelper,TEnumMapperPair(&m_aRowAutoStyleNames,XML_STYLE_FAMILY_TABLE_ROW)) }; - ::std::vector< XMLPropertyState > aPropertyStates; + std::vector< XMLPropertyState > aPropertyStates; for (const auto & i : pExportHelper) { aPropertyStates = i.first->Filter(_xProp); @@ -1177,11 +1177,11 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) }; for (const auto & i : pExportHelper) { - ::std::vector< XMLPropertyState > aPropStates = i.first->Filter( _xProp ); + std::vector< XMLPropertyState > aPropStates = i.first->Filter( _xProp ); if ( !aPropStates.empty() ) { - ::std::vector< XMLPropertyState >::iterator aItr = aPropStates.begin(); - ::std::vector< XMLPropertyState >::const_iterator aEnd = aPropStates.end(); + std::vector< XMLPropertyState >::iterator aItr = aPropStates.begin(); + std::vector< XMLPropertyState >::const_iterator aEnd = aPropStates.end(); const rtl::Reference < XMLPropertySetMapper >& pStyle = i.first->getPropertySetMapper(); while ( aItr != aEnd ) { @@ -1207,7 +1207,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) } if ( XML_STYLE_FAMILY_TABLE_CELL == i.second.second ) - ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), ::std::back_inserter( aPropStates )); + std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), std::back_inserter( aPropStates )); if ( !aPropStates.empty() ) i.second.first->insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( i.second.second, aPropStates ))); } diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 840ea95c8f0a..b82ceeff3370 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -61,9 +61,9 @@ using namespace ::com::sun::star::xml::sax; class ODBExport : public SvXMLExport { - typedef ::std::map< ::xmloff::token::XMLTokenEnum, OUString> TSettingsMap; + typedef std::map< ::xmloff::token::XMLTokenEnum, OUString> TSettingsMap; - typedef ::std::pair< OUString ,OUString> TStringPair; + typedef std::pair< OUString ,OUString> TStringPair; struct TDelimiter { OUString sText; @@ -74,8 +74,8 @@ class ODBExport : public SvXMLExport TDelimiter() : bUsed( false ) { } }; - typedef ::std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap; - typedef ::std::map< Reference<XPropertySet> ,Reference<XPropertySet> > TTableColumnMap; + typedef std::map< Reference<XPropertySet> ,OUString > TPropertyStyleMap; + typedef std::map< Reference<XPropertySet> ,Reference<XPropertySet> > TTableColumnMap; struct TypedPropertyValue { @@ -91,10 +91,10 @@ class ODBExport : public SvXMLExport } }; - ::std::unique_ptr< TStringPair > m_aAutoIncrement; - ::std::unique_ptr< TDelimiter > m_aDelimiter; - ::std::vector< TypedPropertyValue > m_aDataSourceSettings; - ::std::vector< XMLPropertyState > m_aCurrentPropertyStates; + std::unique_ptr< TStringPair > m_aAutoIncrement; + std::unique_ptr< TDelimiter > m_aDelimiter; + std::vector< TypedPropertyValue > m_aDataSourceSettings; + std::vector< XMLPropertyState > m_aCurrentPropertyStates; TPropertyStyleMap m_aAutoStyleNames; TPropertyStyleMap m_aCellAutoStyleNames; TPropertyStyleMap m_aRowAutoStyleNames; @@ -125,7 +125,7 @@ class ODBExport : public SvXMLExport void exportAutoIncrement(); void exportCharSet(); template< typename T > void exportDataSourceSettingsSequence( - ::std::vector< TypedPropertyValue >::iterator const & in); + std::vector< TypedPropertyValue >::iterator const & in); void exportDataSourceSettings(); void exportForms(); void exportReports(); diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index 359647710922..2731ea6b058c 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -38,7 +38,7 @@ namespace dbaxml class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory { protected: - mutable ::std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; + mutable std::unique_ptr<XMLConstantsPropertyHandler> m_pDisplayHandler; public: OPropertyHandlerFactory(); virtual ~OPropertyHandlerFactory() override; diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index 1a5f56a6a266..da60e351ea75 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -27,8 +27,8 @@ namespace dbaxml class ODBFilter; class OXMLTableFilterList : public SvXMLImportContext { - ::std::vector< OUString> m_aPatterns; - ::std::vector< OUString> m_aTypes; + std::vector< OUString> m_aPatterns; + std::vector< OUString> m_aTypes; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 171320c6fac3..ca92b750e99f 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -58,22 +58,22 @@ class ODBFilter : public SvXMLImport { public: typedef std::map< OUString, Sequence<PropertyValue> > TPropertyNameMap; - typedef ::std::vector< css::beans::PropertyValue> TInfoSequence; + typedef std::vector< css::beans::PropertyValue> TInfoSequence; private: TPropertyNameMap m_aQuerySettings; TPropertyNameMap m_aTablesSettings; TInfoSequence m_aInfoSequence; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pLoginElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pDatabaseDescriptionElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pDataSourceInfoElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pDocumentsElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pQueryElemTokenMap; - mutable ::std::unique_ptr<SvXMLTokenMap> m_pColumnElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pDocElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pDatabaseElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pDataSourceElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pLoginElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pDatabaseDescriptionElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pDataSourceInfoElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pDocumentsElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pComponentElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pQueryElemTokenMap; + mutable std::unique_ptr<SvXMLTokenMap> m_pColumnElemTokenMap; mutable rtl::Reference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; mutable rtl::Reference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index 75c6739a2fe1..7b6a5524f562 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -176,7 +176,7 @@ public: /// get access to the (last + 1st) element of the types collection inline TypeIterator end() const; - void fillPageIds(const OUString& _sURL,::std::vector<sal_Int16>& _rOutPathIds) const; + void fillPageIds(const OUString& _sURL,std::vector<sal_Int16>& _rOutPathIds) const; DATASOURCE_TYPE determineType(const OUString& _rDsn) const; diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index aec5f9c17d94..ecb7f0f5d9f2 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -41,7 +41,7 @@ namespace sdbtools ,public ConnectionDependentComponent { private: - ::std::unique_ptr< TableName_Impl > m_pImpl; + std::unique_ptr< TableName_Impl > m_pImpl; public: /** constructs the instance diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 9b58b9a8d0f9..02ddc0f3eb1f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -480,7 +480,7 @@ void SAL_CALL OApplicationController::disposing(const EventObject& _rSource) Reference<XContainer> xContainer( _rSource.Source, UNO_QUERY ); if ( xContainer.is() ) { - TContainerVector::iterator aFind = ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer); + TContainerVector::iterator aFind = std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer); if ( aFind != m_aCurrentContainers.end() ) m_aCurrentContainers.erase(aFind); } @@ -768,10 +768,10 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const && ( getContainer()->isALeafSelected() ) ) { - ::std::vector< OUString > aSelected; + std::vector< OUString > aSelected; getSelectionElementNames( aSelected ); bool bAlterableViews = true; - for ( ::std::vector< OUString >::const_iterator selectedName = aSelected.begin(); + for ( std::vector< OUString >::const_iterator selectedName = aSelected.begin(); bAlterableViews && ( selectedName != aSelected.end() ) ; ++selectedName ) @@ -1006,7 +1006,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa case E_TABLE: { // get the selected tablename - ::std::vector< OUString > aList; + std::vector< OUString > aList; getSelectionElementNames( aList ); if ( !aList.empty() ) m_aTableCopyHelper.SetTableNameForAppend( *aList.begin() ); @@ -1023,7 +1023,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa break; default: { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); OUString sFolderNameToInsertInto; if ( !aList.empty() ) @@ -1049,10 +1049,10 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); ScopedVclPtr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( getView() )); - ::std::vector<SotClipboardFormatId> aFormatIds; + std::vector<SotClipboardFormatId> aFormatIds; getSupportedFormats(getContainer()->getElementType(),aFormatIds); - const ::std::vector<SotClipboardFormatId>::const_iterator aEnd = aFormatIds.end(); - for (::std::vector<SotClipboardFormatId>::const_iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter) + const std::vector<SotClipboardFormatId>::const_iterator aEnd = aFormatIds.end(); + for (std::vector<SotClipboardFormatId>::const_iterator aIter = aFormatIds.begin();aIter != aEnd; ++aIter) pDlg->Insert(*aIter,""); const TransferableDataHelper& rClipboard = getViewClipboard(); @@ -1507,7 +1507,7 @@ void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rE ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); - if ( ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) + if ( std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) { OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); if ( getContainer() ) @@ -1543,7 +1543,7 @@ void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEv ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); - if ( ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) + if ( std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) { OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); OUString sName; @@ -1577,7 +1577,7 @@ void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rE ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); - if ( ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) + if ( std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xContainer) != m_aCurrentContainers.end() ) { OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); OUString sName; @@ -1795,7 +1795,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const { if ( isStandaloneDocument || !m_pSubComponentManager->activateSubFrame( _sName, _eType, _eOpenMode, xRet ) ) { - ::std::unique_ptr< OLinkedDocumentsAccess > aHelper = getDocumentsAccess( _eType ); + std::unique_ptr< OLinkedDocumentsAccess > aHelper = getDocumentsAccess( _eType ); if ( !aHelper->isConnected() ) break; @@ -1817,7 +1817,7 @@ Reference< XComponent > OApplicationController::openElementWithArguments( const if ( !xConnection.is() ) break; - ::std::unique_ptr< DatabaseObjectView > pDesigner; + std::unique_ptr< DatabaseObjectView > pDesigner; ::comphelper::NamedValueCollection aArguments( _rAdditionalArguments ); Any aDataSource; @@ -1899,7 +1899,7 @@ void OApplicationController::newElementWithPilot( ElementType _eType ) case E_REPORT: case E_FORM: { - ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); + std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); if ( aHelper->isConnected() ) { sal_Int32 nCommandType = -1; @@ -1914,7 +1914,7 @@ void OApplicationController::newElementWithPilot( ElementType _eType ) case E_QUERY: case E_TABLE: { - ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); + std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess(_eType); if ( aHelper->isConnected() ) { if ( E_QUERY == _eType ) @@ -1945,7 +1945,7 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType, case E_FORM: case E_REPORT: { - ::std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess( _eType ); + std::unique_ptr<OLinkedDocumentsAccess> aHelper = getDocumentsAccess( _eType ); if ( !aHelper->isConnected() ) break; @@ -1956,7 +1956,7 @@ Reference< XComponent > OApplicationController::newElement( ElementType _eType, case E_QUERY: case E_TABLE: { - ::std::unique_ptr< DatabaseObjectView > pDesigner; + std::unique_ptr< DatabaseObjectView > pDesigner; SharedConnection xConnection( ensureConnection() ); if ( !xConnection.is() ) break; @@ -1994,7 +1994,7 @@ void OApplicationController::addContainerListener(const Reference<XNameAccess>& if ( xCont.is() ) { // add as listener to get notified if elements are inserted or removed - TContainerVector::const_iterator aFind = ::std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xCont); + TContainerVector::const_iterator aFind = std::find(m_aCurrentContainers.begin(),m_aCurrentContainers.end(),xCont); if ( aFind == m_aCurrentContainers.end() ) { xCont->addContainerListener(this); @@ -2014,7 +2014,7 @@ void OApplicationController::renameEntry() ::osl::MutexGuard aGuard( getMutex() ); OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); Reference< XNameAccess > xContainer = getElements(getContainer()->getElementType()); @@ -2026,7 +2026,7 @@ void OApplicationController::renameEntry() { if ( xContainer.is() ) { - ::std::unique_ptr< IObjectNameCheck > pNameChecker; + std::unique_ptr< IObjectNameCheck > pNameChecker; VclPtr< OSaveAsDlg > aDialog; Reference<XRename> xRename; @@ -2339,7 +2339,7 @@ sal_Int8 OApplicationController::queryDrop( const AcceptDropEvent& _rEvt, const if ( eType != E_NONE && (eType != E_TABLE || !isConnectionReadOnly()) ) { // check for the concrete type - if(::std::any_of(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(eType))) + if(std::any_of(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(eType))) return DND_ACTION_COPY; if ( eType == E_FORM || eType == E_REPORT ) { diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 4557ef0e408a..24dbc9c7e749 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -84,7 +84,7 @@ namespace dbaui ,public IContextMenuProvider { public: - typedef ::std::vector< css::uno::Reference< css::container::XContainer > > TContainerVector; + typedef std::vector< css::uno::Reference< css::container::XContainer > > TContainerVector; private: @@ -118,9 +118,9 @@ namespace dbaui bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date bool m_bSuspended; // is true when the controller was already suspended - ::std::unique_ptr< SelectionNotifier > + std::unique_ptr< SelectionNotifier > m_pSelectionNotifier; - typedef ::std::map< ElementType, ::std::vector< OUString > > SelectionByElementType; + typedef std::map< ElementType, std::vector< OUString > > SelectionByElementType; SelectionByElementType m_aPendingSelection; private: @@ -190,7 +190,7 @@ namespace dbaui bool isConnectionReadOnly() const; /// fills the list with the selected entries. - void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; + void getSelectionElementNames( std::vector< OUString>& _rNames ) const; /// deletes the entries selected. void deleteEntries(); @@ -207,14 +207,14 @@ namespace dbaui determines whether the user must confirm the deletion */ void deleteObjects( ElementType _eType, - const ::std::vector< OUString>& _rList, + const std::vector< OUString>& _rList, bool _bConfirm ); /** deletes tables. @param _rList The list of tables. */ - void deleteTables(const ::std::vector< OUString>& _rList); + void deleteTables(const std::vector< OUString>& _rList); /// copies the current object into clipboard TransferableHelper* copyObject(); @@ -225,9 +225,9 @@ namespace dbaui /** returns the document access for the specific type @param _eType the type - @return ::std::unique_ptr<OLinkedDocumentsAccess> + @return std::unique_ptr<OLinkedDocumentsAccess> */ - ::std::unique_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); + std::unique_ptr<OLinkedDocumentsAccess> getDocumentsAccess(ElementType _eType); /// returns the query definitions of the active data source. css::uno::Reference< css::container::XNameContainer> getQueryDefinitions() const; @@ -264,7 +264,7 @@ namespace dbaui @param _rFormatIds The vector to be filled up. */ - static void getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds); + static void getSupportedFormats(ElementType _eType,std::vector<SotClipboardFormatId>& _rFormatIds); /** adds a listener to the current name access. @param _xCollection diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index d763bf18889b..813ac916746f 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -98,7 +98,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::util; -void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList) +void OApplicationController::deleteTables(const std::vector< OUString>& _rList) { SharedConnection xConnection( ensureConnection() ); @@ -111,8 +111,8 @@ void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList if ( xDrop.is() ) { bool bConfirm = true; - ::std::vector< OUString>::const_iterator aEnd = _rList.end(); - for (::std::vector< OUString>::const_iterator aIter = _rList.begin(); aIter != aEnd; ++aIter) + std::vector< OUString>::const_iterator aEnd = _rList.end(); + for (std::vector< OUString>::const_iterator aIter = _rList.begin(); aIter != aEnd; ++aIter) { OUString sTableName = *aIter; @@ -182,7 +182,7 @@ void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList } } -void OApplicationController::deleteObjects( ElementType _eType, const ::std::vector< OUString>& _rList, bool _bConfirm ) +void OApplicationController::deleteObjects( ElementType _eType, const std::vector< OUString>& _rList, bool _bConfirm ) { Reference< XNameContainer > xNames( getElements( _eType ), UNO_QUERY ); Reference< XHierarchicalNameContainer > xHierarchyName( xNames, UNO_QUERY ); @@ -195,19 +195,19 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec // be the ancestor or child of another element from the list. // We want to ensure that ancestors get deleted first, so we normalize the list in this respect. // #i33353# - ::std::set< OUString > aDeleteNames; - // Note that this implicitly uses ::std::less< OUString > a comparison operation, which + std::set< OUString > aDeleteNames; + // Note that this implicitly uses std::less< OUString > a comparison operation, which // results in lexicographical order, which is exactly what we need, because "foo" is *before* // any "foo/bar" in this order. - ::std::copy( + std::copy( _rList.begin(), _rList.end(), - ::std::insert_iterator< ::std::set< OUString > >( aDeleteNames, aDeleteNames.begin() ) + std::insert_iterator< std::set< OUString > >( aDeleteNames, aDeleteNames.begin() ) ); - ::std::set< OUString >::size_type nCount = aDeleteNames.size(); - for ( ::std::set< OUString >::size_type nObjectsLeft = nCount; !aDeleteNames.empty(); ) + std::set< OUString >::size_type nCount = aDeleteNames.size(); + for ( std::set< OUString >::size_type nObjectsLeft = nCount; !aDeleteNames.empty(); ) { - ::std::set< OUString >::const_iterator aThisRound = aDeleteNames.begin(); + std::set< OUString >::const_iterator aThisRound = aDeleteNames.begin(); if ( eResult != svtools::QUERYDELETE_ALL ) { @@ -252,12 +252,12 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec OUStringBuffer sSmallestSiblingName( *aThisRound ); sSmallestSiblingName.append( (sal_Unicode)( '/' + 1) ); - ::std::set< OUString >::const_iterator aUpperChildrenBound = aDeleteNames.lower_bound( sSmallestSiblingName.makeStringAndClear() ); - for ( ::std::set< OUString >::const_iterator aObsolete = aThisRound; + std::set< OUString >::const_iterator aUpperChildrenBound = aDeleteNames.lower_bound( sSmallestSiblingName.makeStringAndClear() ); + for ( std::set< OUString >::const_iterator aObsolete = aThisRound; aObsolete != aUpperChildrenBound; ) { - ::std::set< OUString >::const_iterator aNextObsolete = aObsolete; ++aNextObsolete; + std::set< OUString >::const_iterator aNextObsolete = aObsolete; ++aNextObsolete; aDeleteNames.erase( aObsolete ); --nObjectsLeft; aObsolete = aNextObsolete; @@ -299,7 +299,7 @@ void OApplicationController::deleteEntries() if ( getContainer() ) { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); ElementType eType = getContainer()->getElementType(); switch(eType) @@ -483,7 +483,7 @@ Reference< XNameAccess > OApplicationController::getElements( ElementType _eType return xElements; } -void OApplicationController::getSelectionElementNames(::std::vector< OUString>& _rNames) const +void OApplicationController::getSelectionElementNames(std::vector< OUString>& _rNames) const { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -493,7 +493,7 @@ void OApplicationController::getSelectionElementNames(::std::vector< OUString>& getContainer()->getSelectionElementNames( _rNames ); } -::std::unique_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType ) +std::unique_ptr< OLinkedDocumentsAccess > OApplicationController::getDocumentsAccess( ElementType _eType ) { OSL_ENSURE( ( _eType == E_TABLE ) || ( _eType == E_QUERY ) || ( _eType == E_FORM ) || ( _eType == E_REPORT ), "OApplicationController::getDocumentsAccess: only forms and reports are supported here!" ); @@ -507,7 +507,7 @@ void OApplicationController::getSelectionElementNames(::std::vector< OUString>& OSL_ENSURE( xDocContainer.is(), "OApplicationController::getDocumentsAccess: invalid container!" ); } - ::std::unique_ptr< OLinkedDocumentsAccess > pDocuments( new OLinkedDocumentsAccess( + std::unique_ptr< OLinkedDocumentsAccess > pDocuments( new OLinkedDocumentsAccess( getView(), this, getORB(), xDocContainer, xConnection, getDatabaseName() ) ); return pDocuments; @@ -551,7 +551,7 @@ TransferableHelper* OApplicationController::copyObject() case E_FORM: case E_REPORT: { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); Reference< XHierarchicalNameAccess > xElements(getElements(eType),UNO_QUERY); if ( xElements.is() && !aList.empty() ) @@ -775,7 +775,7 @@ Reference<XNameContainer> OApplicationController::getQueryDefinitions() const return xNames; } -void OApplicationController::getSupportedFormats(ElementType _eType,::std::vector<SotClipboardFormatId>& _rFormatIds) +void OApplicationController::getSupportedFormats(ElementType _eType,std::vector<SotClipboardFormatId>& _rFormatIds) { switch( _eType ) { @@ -816,7 +816,7 @@ IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop, void*, void ) { Reference<XContent> xContent; m_aAsyncDrop.aDroppedData[DataAccessDescriptorProperty::Component] >>= xContent; - ::std::vector< OUString> aList; + std::vector< OUString> aList; sal_Int32 nIndex = 0; OUString sName = xContent->getIdentifier()->getContentIdentifier(); OUString sErase = sName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 72202357a71d..96eee0c85e3b 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -618,7 +618,7 @@ bool OApplicationController::isRenameDeleteAllowed(ElementType _eType, bool _bDe bCompareRes = getContainer()->getSelectionCount() == 1; if ( bEnabled && bCompareRes && E_TABLE == eType ) { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); try @@ -675,7 +675,7 @@ void OApplicationController::onLoadedMenu(const Reference< css::frame::XLayoutMa void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eOpenMode) { - ::std::vector< OUString> aList; + std::vector< OUString> aList; getSelectionElementNames(aList); ElementType eType = getContainer()->getElementType(); ::comphelper::NamedValueCollection aArguments; @@ -686,16 +686,16 @@ void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eO eOpenMode = E_OPEN_NORMAL; } - ::std::vector< ::std::pair< OUString ,Reference< XModel > > > aComponents; - ::std::vector< OUString>::const_iterator aEnd = aList.end(); - for (::std::vector< OUString>::const_iterator aIter = aList.begin(); aIter != aEnd; ++aIter) + std::vector< std::pair< OUString ,Reference< XModel > > > aComponents; + std::vector< OUString>::const_iterator aEnd = aList.end(); + for (std::vector< OUString>::const_iterator aIter = aList.begin(); aIter != aEnd; ++aIter) { if ( SID_DB_APP_CONVERTTOVIEW == _nId ) convertToView(*aIter); else { Reference< XModel > xModel( openElementWithArguments( *aIter, eType, eOpenMode, _nId,aArguments ), UNO_QUERY ); - aComponents.push_back( ::std::pair< OUString, Reference< XModel > >( *aIter, xModel ) ); + aComponents.push_back( std::pair< OUString, Reference< XModel > >( *aIter, xModel ) ); } } @@ -703,8 +703,8 @@ void OApplicationController::doAction(sal_uInt16 _nId, const ElementOpenMode _eO if ( _eOpenMode == E_OPEN_FOR_MAIL ) { - ::std::vector< ::std::pair< OUString ,Reference< XModel > > >::const_iterator componentIter = aComponents.begin(); - ::std::vector< ::std::pair< OUString ,Reference< XModel > > >::const_iterator componentEnd = aComponents.end(); + std::vector< std::pair< OUString ,Reference< XModel > > >::const_iterator componentIter = aComponents.begin(); + std::vector< std::pair< OUString ,Reference< XModel > > >::const_iterator componentEnd = aComponents.end(); OUString aDocTypeString; SfxMailModel aSendMail; SfxMailModel::SendMailResult eResult = SfxMailModel::SEND_MAIL_OK; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 2a65a8852832..ac36ea17bc1d 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -311,7 +311,7 @@ void OAppDetailPageHelper::sortUp() sort(nPos,SortAscending); } -void OAppDetailPageHelper::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const +void OAppDetailPageHelper::getSelectionElementNames( std::vector< OUString>& _rNames ) const { int nPos = getVisibleControlIndex(); if ( nPos < E_ELEMENT_TYPE_COUNT ) @@ -366,7 +366,7 @@ void OAppDetailPageHelper::describeCurrentSelectionForType( const ElementType _e if ( !pList ) return; - ::std::vector< NamedDatabaseObject > aSelected; + std::vector< NamedDatabaseObject > aSelected; SvTreeListEntry* pEntry = pList->FirstSelected(); while( pEntry ) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 7aeda4283357..b94c4c77624b 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -209,7 +209,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; + void getSelectionElementNames( std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index d9f8a0b3fe62..9961e28beb2d 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -162,8 +162,8 @@ Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine ) aRect.Left() = pTab->GetPos() - pItemData->maSize.Width() / 2; // inflate the rectangle a little bit - looks better, too - aRect.Left() = ::std::max< long >( 0, aRect.Left() - 2 ); - aRect.Right() = ::std::min< long >( GetOutputSizePixel().Width() - 1, aRect.Right() + 2 ); + aRect.Left() = std::max< long >( 0, aRect.Left() - 2 ); + aRect.Right() = std::min< long >( GetOutputSizePixel().Width() - 1, aRect.Right() + 2 ); return aRect; } @@ -785,7 +785,7 @@ sal_Int32 OApplicationDetailView::getElementCount() return m_pControlHelper->getElementCount(); } -void OApplicationDetailView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const +void OApplicationDetailView::getSelectionElementNames( std::vector< OUString>& _rNames ) const { m_pControlHelper->getSelectionElementNames( _rNames ); } diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 988be3f003b9..03cb81134b6a 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -99,7 +99,7 @@ namespace dbaui TaskEntry( const sal_Char* _pAsciiUNOCommand, sal_uInt16 _nHelpID, sal_uInt16 _nTitleResourceID, bool _bHideWhenDisabled = false ); }; - typedef ::std::vector< TaskEntry > TaskEntryList; + typedef std::vector< TaskEntry > TaskEntryList; struct TaskPaneData { @@ -150,7 +150,7 @@ namespace dbaui VclPtr<OTitleWindow> m_aContainer; OAppBorderWindow& m_rBorderWin; // my parent VclPtr<OAppDetailPageHelper> m_pControlHelper; - ::std::vector< TaskPaneData > m_aTaskPaneData; + std::vector< TaskPaneData > m_aTaskPaneData; MnemonicGenerator m_aExternalMnemonics; void ImplInitSettings(); @@ -256,7 +256,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames(::std::vector< OUString>& _rNames ) const; + void getSelectionElementNames(std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index c4b1a92908ac..f8831c38ef4b 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -122,7 +122,7 @@ void OAppBorderWindow::Resize() if ( pSwap->GetEntryCount() != 0 ) nX = pSwap->GetBoundingBox( pSwap->GetEntry(0) ).GetWidth() + aFLSize.Height(); } - nX = ::std::max(m_pPanel->GetWidthPixel() ,nX); + nX = std::max(m_pPanel->GetWidthPixel() ,nX); m_pPanel->SetPosSizePixel(Point(0,0),Size(nX,nOutputHeight)); } @@ -401,7 +401,7 @@ sal_Int32 OApplicationView::getElementCount() return getDetailView()->getElementCount(); } -void OApplicationView::getSelectionElementNames( ::std::vector< OUString>& _rNames ) const +void OApplicationView::getSelectionElementNames( std::vector< OUString>& _rNames ) const { OSL_ENSURE(m_pWin && getDetailView(),"Detail view is NULL! -> GPF"); getDetailView()->getSelectionElementNames( _rNames ); diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index d057ea3eb6ff..136c25535962 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -189,7 +189,7 @@ namespace dbaui @param _rNames The list will be filled. */ - void getSelectionElementNames( ::std::vector< OUString>& _rNames ) const; + void getSelectionElementNames( std::vector< OUString>& _rNames ) const; /** describes the current selection for the given control */ diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index fbe1bdc05f54..900f6845441c 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -157,7 +157,7 @@ namespace dbaui } }; - struct SelectSubComponent : public ::std::unary_function< SubComponentDescriptor, Reference< XComponent > > + struct SelectSubComponent : public std::unary_function< SubComponentDescriptor, Reference< XComponent > > { Reference< XComponent > operator()( const SubComponentDescriptor &_desc ) const { @@ -168,9 +168,9 @@ namespace dbaui } }; - typedef ::std::vector< SubComponentDescriptor > SubComponents; + typedef std::vector< SubComponentDescriptor > SubComponents; - struct SubComponentMatch : public ::std::unary_function< SubComponentDescriptor, bool > + struct SubComponentMatch : public std::unary_function< SubComponentDescriptor, bool > { public: SubComponentMatch( const OUString& i_rName, const sal_Int32 i_nComponentType, @@ -413,7 +413,7 @@ namespace dbaui ::osl::MutexGuard aGuard( m_pData->getMutex() ); Sequence< Reference< XComponent > > aComponents( m_pData->m_aComponents.size() ); - ::std::transform( + std::transform( m_pData->m_aComponents.begin(), m_pData->m_aComponents.end(), aComponents.getArray(), @@ -461,7 +461,7 @@ namespace dbaui if ( !_rName.isEmpty() ) { // check there does not already exist such a component - SubComponents::const_iterator existentPos = ::std::find_if( + SubComponents::const_iterator existentPos = std::find_if( m_pData->m_aComponents.begin(), m_pData->m_aComponents.end(), SubComponentMatch( _rName, _nComponentType, _eOpenMode ) @@ -492,7 +492,7 @@ namespace dbaui { ::osl::MutexGuard aGuard( m_pData->getMutex() ); - SubComponents::const_iterator pos = ::std::find_if( + SubComponents::const_iterator pos = std::find_if( m_pData->m_aComponents.begin(), m_pData->m_aComponents.end(), SubComponentMatch( _rName, _nComponentType, _eOpenMode ) diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index 8572f2342e69..a7a1fb8bed96 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -113,7 +113,7 @@ namespace dbaui ); private: - ::std::unique_ptr< SubComponentManager_Data > m_pData; + std::unique_ptr< SubComponentManager_Data > m_pData; }; } // namespace dbaui diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index f2813dd90764..e854c2435d5c 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1831,7 +1831,7 @@ void SbaXDataBrowserController::ExecuteSearch() VclPtr<AbstractFmSearchDialog> pDialog; if ( pFact ) { - ::std::vector< OUString > aContextNames; + std::vector< OUString > aContextNames; aContextNames.push_back( OUString("Standard") ); pDialog = pFact->CreateFmSearchDialog(getBrowserView(), sInitialText, aContextNames, 0, LINK(this, SbaXDataBrowserController, OnSearchContextRequest)); } diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 51221cc8b34e..a09b4a000744 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -109,7 +109,7 @@ namespace dbaui if ( xChild.is() ) xStore.set( getDataSourceOrModel(xChild->getParent()), UNO_QUERY ); // check for the concrete type - if ( xStore.is() && !xStore->isReadonly() && ::std::any_of(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(E_TABLE)) ) + if ( xStore.is() && !xStore->isReadonly() && std::any_of(_rFlavors.begin(),_rFlavors.end(),TAppSupportedSotFunctor(E_TABLE)) ) return DND_ACTION_COPY; } } diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 20ae83b97b56..083f2f536420 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1087,7 +1087,7 @@ void SAL_CALL SbaXFormAdapter::dispose() m_aContainerListeners.disposeAndClear(aEvt); // dispose all children - for ( ::std::vector< Reference< css::form::XFormComponent > >::const_iterator aIter = m_aChildren.begin(); + for ( std::vector< Reference< css::form::XFormComponent > >::const_iterator aIter = m_aChildren.begin(); aIter != m_aChildren.end(); ++aIter ) @@ -1429,9 +1429,9 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const OU sal_Int32 SbaXFormAdapter::implGetPos(const OUString& rName) { - ::std::vector< OUString>::const_iterator aIter = ::std::find_if( m_aChildNames.begin(), + std::vector< OUString>::const_iterator aIter = std::find_if( m_aChildNames.begin(), m_aChildNames.end(), - ::std::bind2nd(::std::equal_to< OUString>(),rName)); + std::bind2nd(std::equal_to< OUString>(),rName)); if(aIter != m_aChildNames.end()) return aIter - m_aChildNames.begin(); @@ -1632,9 +1632,9 @@ void SAL_CALL SbaXFormAdapter::propertyChange(const css::beans::PropertyChangeEv { if (evt.PropertyName == PROPERTY_NAME) { - ::std::vector< css::uno::Reference< css::form::XFormComponent > >::const_iterator aIter = ::std::find_if( m_aChildren.begin(), + std::vector< css::uno::Reference< css::form::XFormComponent > >::const_iterator aIter = std::find_if( m_aChildren.begin(), m_aChildren.end(), - ::std::bind2nd(::std::equal_to< css::uno::Reference< css::uno::XInterface > >(),evt.Source)); + std::bind2nd(std::equal_to< css::uno::Reference< css::uno::XInterface > >(),evt.Source)); if(aIter != m_aChildren.end()) { @@ -1652,9 +1652,9 @@ void SAL_CALL SbaXFormAdapter::disposing(const css::lang::EventObject& Source) if (Source.Source == m_xMainForm) dispose(); - ::std::vector< css::uno::Reference< css::form::XFormComponent > >::const_iterator aIter = ::std::find_if( m_aChildren.begin(), + std::vector< css::uno::Reference< css::form::XFormComponent > >::const_iterator aIter = std::find_if( m_aChildren.begin(), m_aChildren.end(), - ::std::bind2nd(::std::equal_to< css::uno::Reference< css::uno::XInterface > >(),Source.Source)); + std::bind2nd(std::equal_to< css::uno::Reference< css::uno::XInterface > >(),Source.Source)); if(aIter != m_aChildren.end()) removeByIndex(aIter - m_aChildren.begin()); } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index f8c6113a5479..dcac408abfce 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -78,8 +78,8 @@ using namespace ::dbtools; using namespace ::comphelper; #define ALL_FEATURES -1 -#define FIRST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() - 1000 ) -#define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() ) +#define FIRST_USER_DEFINED_FEATURE ( std::numeric_limits< sal_uInt16 >::max() - 1000 ) +#define LAST_USER_DEFINED_FEATURE ( std::numeric_limits< sal_uInt16 >::max() ) typedef std::unordered_map< sal_Int16, sal_Int16 > CommandHashMap; @@ -401,7 +401,7 @@ void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) namespace { - typedef ::std::vector< Any > States; + typedef std::vector< Any > States; void lcl_notifyMultipleStates( XStatusListener& _rListener, FeatureStateEvent& _rEvent, const States& _rStates ) { @@ -503,10 +503,10 @@ void OGenericUnoController::ImplBroadcastFeatureState(const OUString& _rFeature, bool OGenericUnoController::isFeatureSupported( sal_Int32 _nId ) { - SupportedFeatures::const_iterator aFeaturePos = ::std::find_if( + SupportedFeatures::const_iterator aFeaturePos = std::find_if( m_aSupportedFeatures.begin(), m_aSupportedFeatures.end(), - ::std::bind2nd( CompareFeatureById(), _nId ) + std::bind2nd( CompareFeatureById(), _nId ) ); return ( m_aSupportedFeatures.end() != aFeaturePos && !aFeaturePos->first.isEmpty()); @@ -536,10 +536,10 @@ void OGenericUnoController::InvalidateFeature_Impl() } else { - SupportedFeatures::const_iterator aFeaturePos = ::std::find_if( + SupportedFeatures::const_iterator aFeaturePos = std::find_if( m_aSupportedFeatures.begin(), m_aSupportedFeatures.end(), - ::std::bind2nd( CompareFeatureById(), aNextFeature.nId ) + std::bind2nd( CompareFeatureById(), aNextFeature.nId ) ); #if OSL_DEBUG_LEVEL > 0 @@ -573,10 +573,10 @@ void OGenericUnoController::ImplInvalidateFeature( sal_Int32 _nId, const Referen #if OSL_DEBUG_LEVEL > 0 if ( _nId != -1 ) { - SupportedFeatures::const_iterator aFeaturePos = ::std::find_if( + SupportedFeatures::const_iterator aFeaturePos = std::find_if( m_aSupportedFeatures.begin(), m_aSupportedFeatures.end(), - ::std::bind2nd( CompareFeatureById(), _nId ) + std::bind2nd( CompareFeatureById(), _nId ) ); OSL_ENSURE( aFeaturePos != m_aSupportedFeatures.end(), "OGenericUnoController::ImplInvalidateFeature: invalidating an unsupported feature is suspicious, at least!" ); } @@ -759,9 +759,9 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene // now remove the listener from the deque ::osl::MutexGuard aGuard( m_aFeatureMutex ); m_aFeaturesToInvalidate.erase( - ::std::remove_if( m_aFeaturesToInvalidate.begin(), + std::remove_if( m_aFeaturesToInvalidate.begin(), m_aFeaturesToInvalidate.end(), - ::std::bind2nd(FindFeatureListener(),aListener)) + std::bind2nd(FindFeatureListener(),aListener)) ,m_aFeaturesToInvalidate.end()); } @@ -897,10 +897,10 @@ URL OGenericUnoController::getURLForId(sal_Int32 _nId) const URL aReturn; if ( m_xUrlTransformer.is() ) { - SupportedFeatures::const_iterator aIter = ::std::find_if( + SupportedFeatures::const_iterator aIter = std::find_if( m_aSupportedFeatures.begin(), m_aSupportedFeatures.end(), - ::std::bind2nd( CompareFeatureById(), _nId ) + std::bind2nd( CompareFeatureById(), _nId ) ); if ( m_aSupportedFeatures.end() != aIter && !aIter->first.isEmpty() ) @@ -1452,7 +1452,7 @@ namespace Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableDispatchInformation( ::sal_Int16 CommandGroup ) { - ::std::list< DispatchInformation > aInformationList; + std::list< DispatchInformation > aInformationList; DispatchInformation aDispatchInfo; for ( SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.begin(); aIter != m_aSupportedFeatures.end(); @@ -1467,7 +1467,7 @@ Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableD } Sequence< DispatchInformation > aInformation( aInformationList.size() ); - ::std::transform( aInformationList.begin(), + std::transform( aInformationList.begin(), aInformationList.end(), aInformation.getArray(), SGI_identity< DispatchInformation >() diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index a8e8ba27dbfe..e639e8026795 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -696,7 +696,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM if(!xField.is()) break; - ::std::vector< std::shared_ptr<OTableRow> > vClipboardList; + std::vector< std::shared_ptr<OTableRow> > vClipboardList; // send it to the clipboard vClipboardList.push_back(std::make_shared<OTableRow>(xField)); OTableRowExchange* pData = new OTableRowExchange(vClipboardList); @@ -1222,7 +1222,7 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos) } /// unary_function Functor object for class ZZ returntype is void - struct SbaGridControlPrec : ::std::unary_function<DataFlavorExVector::value_type,bool> + struct SbaGridControlPrec : std::unary_function<DataFlavorExVector::value_type,bool> { inline bool operator()(const DataFlavorExVector::value_type& _aType) { @@ -1326,7 +1326,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) if(nAction != DND_ACTION_COPY && GetEmptyRow().is()) { const DataFlavorExVector& _rFlavors = GetDataFlavors(); - if(::std::any_of(_rFlavors.begin(),_rFlavors.end(),SbaGridControlPrec())) + if(std::any_of(_rFlavors.begin(),_rFlavors.end(),SbaGridControlPrec())) nAction = DND_ACTION_COPY; } @@ -1387,7 +1387,7 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) if(GetEmptyRow().is()) { const DataFlavorExVector& _rFlavors = GetDataFlavors(); - if( ::std::any_of(_rFlavors.begin(),_rFlavors.end(), SbaGridControlPrec()) ) + if( std::any_of(_rFlavors.begin(),_rFlavors.end(), SbaGridControlPrec()) ) { TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable ); m_aDataDescriptor = ODataAccessObjectTransferable::extractObjectDescriptor(aDropped); diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 0282541fcf5a..0b433e3b8146 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -265,11 +265,11 @@ Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes( ) if ( !m_aDocScriptSupport || !*m_aDocScriptSupport ) { Sequence< Type > aStrippedTypes( aTypes.getLength() - 1 ); - ::std::remove_copy_if( + std::remove_copy_if( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), aStrippedTypes.getArray(), - ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() ) + std::bind2nd( std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() ) ); aTypes = aStrippedTypes; } @@ -299,7 +299,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing() clearTreeModel(); // clear the tree model { - ::std::unique_ptr<SvTreeList> aTemp(m_pTreeModel); + std::unique_ptr<SvTreeList> aTemp(m_pTreeModel); m_pTreeModel = nullptr; } @@ -387,7 +387,7 @@ bool SbaTableQueryBrowser::Construct(vcl::Window* pParent) namespace { - struct SelectValueByName : public ::std::unary_function< OUString, Any > + struct SelectValueByName : public std::unary_function< OUString, Any > { const Any& operator()( OUString const& i_name ) const { @@ -543,12 +543,12 @@ bool SbaTableQueryBrowser::InitializeForm( const Reference< XPropertySet > & i_f aPropertyValues.put( aTransferPropertie, pData->xObjectProperties->getPropertyValue( aTransferPropertie ) ); } - ::std::vector< OUString > aNames( aPropertyValues.getNames() ); - ::std::sort(aNames.begin(), aNames.end()); + std::vector< OUString > aNames( aPropertyValues.getNames() ); + std::sort(aNames.begin(), aNames.end()); Sequence< OUString > aPropNames( comphelper::containerToSequence(aNames) ); Sequence< Any > aPropValues( aNames.size() ); - ::std::transform( aNames.begin(), aNames.end(), aPropValues.getArray(), SelectValueByName( aPropertyValues ) ); + std::transform( aNames.begin(), aNames.end(), aPropValues.getArray(), SelectValueByName( aPropertyValues ) ); Reference< XMultiPropertySet > xFormMultiSet( i_formProperties, UNO_QUERY_THROW ); xFormMultiSet->setPropertyValues( aPropNames, aPropValues ); @@ -685,8 +685,8 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm bool bFormattedIsNumeric = true; sal_Int32 nType = ::comphelper::getINT32( xColumn->getPropertyValue( PROPERTY_TYPE ) ); - ::std::vector< NamedValue > aInitialValues; - ::std::vector< OUString > aCopyProperties; + std::vector< NamedValue > aInitialValues; + std::vector< OUString > aCopyProperties; Any aDefault; switch(nType) @@ -791,14 +791,14 @@ bool SbaTableQueryBrowser::InitializeGridModel(const Reference< css::form::XForm aInitialValues.push_back( NamedValue( PROPERTY_MOUSE_WHEEL_BEHAVIOR, makeAny( MouseWheelBehavior::SCROLL_DISABLED ) ) ); // now set all those values - for ( ::std::vector< NamedValue >::const_iterator property = aInitialValues.begin(); + for ( std::vector< NamedValue >::const_iterator property = aInitialValues.begin(); property != aInitialValues.end(); ++property ) { xGridCol->setPropertyValue( property->Name, property->Value ); } - for ( ::std::vector< OUString >::const_iterator copyPropertyName = aCopyProperties.begin(); + for ( std::vector< OUString >::const_iterator copyPropertyName = aCopyProperties.begin(); copyPropertyName != aCopyProperties.end(); ++copyPropertyName ) @@ -2132,7 +2132,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce SvTreeListEntry* SbaTableQueryBrowser::implAppendEntry( SvTreeListEntry* _pParent, const OUString& _rName, void* _pUserData, EntryType _eEntryType ) { - ::std::unique_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) ); + std::unique_ptr< ImageProvider > pImageProvider( getImageProviderFor( _pParent ) ); Image aImage; pImageProvider->getImages( _rName, getDatabaseObjectType( _eEntryType ), aImage ); @@ -3281,9 +3281,9 @@ bool SbaTableQueryBrowser::ensureConnection(SvTreeListEntry* _pAnyEntry, SharedC return ensureConnection( pDSEntry, pDSData, _rConnection ); } -::std::unique_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry ) +std::unique_ptr< ImageProvider > SbaTableQueryBrowser::getImageProviderFor( SvTreeListEntry* _pAnyEntry ) { - ::std::unique_ptr< ImageProvider > pImageProvider( new ImageProvider ); + std::unique_ptr< ImageProvider > pImageProvider( new ImageProvider ); SharedConnection xConnection; if ( getExistentConnectionFor( _pAnyEntry, xConnection ) ) pImageProvider.reset( new ImageProvider( xConnection ) ); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 48bad58c95db..f193978e52cc 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -253,7 +253,7 @@ namespace if (_pWindow) { long nTemp = _pWindow->GetSizePixel().Width() + _pWindow->GetPosPixel().X(); - _rnMaxXPosition = ::std::max(_rnMaxXPosition, nTemp); + _rnMaxXPosition = std::max(_rnMaxXPosition, nTemp); } } } @@ -666,7 +666,7 @@ void OFieldDescControl::ArrangeAggregates() { if (adAggregate.pctrlTextControl) { - nMaxWidth = ::std::max<long>(OutputDevice::GetTextWidth(adAggregate.pctrlTextControl->GetText()),nMaxWidth); + nMaxWidth = std::max<long>(OutputDevice::GetTextWidth(adAggregate.pctrlTextControl->GetText()),nMaxWidth); } } @@ -1135,7 +1135,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if (pFieldType->nPrecision) { ActivateAggregate( tpLength ); - pLength->SetMax(::std::max<sal_Int32>(pFieldType->nPrecision,pFieldDescr->GetPrecision())); + pLength->SetMax(std::max<sal_Int32>(pFieldType->nPrecision,pFieldDescr->GetPrecision())); pLength->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty()); } else @@ -1144,7 +1144,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if (pFieldType->nMaximumScale) { ActivateAggregate( tpScale ); - pScale->SetMax(::std::max<sal_Int32>(pFieldType->nMaximumScale,pFieldDescr->GetScale())); + pScale->SetMax(std::max<sal_Int32>(pFieldType->nMaximumScale,pFieldDescr->GetScale())); pScale->SetMin(pFieldType->nMinimumScale); pScale->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty() || pFieldType->aCreateParams == "PRECISION"); } @@ -1165,7 +1165,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) if (pFieldType->nPrecision) { ActivateAggregate( tpTextLen ); - pTextLen->SetMax(::std::max<sal_Int32>(pFieldType->nPrecision,pFieldDescr->GetPrecision())); + pTextLen->SetMax(std::max<sal_Int32>(pFieldType->nPrecision,pFieldDescr->GetPrecision())); pTextLen->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty()); } else diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 39c001c39fb7..340e1b863431 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -181,7 +181,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn namespace { - struct OViewSetter : public ::std::unary_function< OTableTreeListBox::TNames::value_type, bool> + struct OViewSetter : public std::unary_function< OTableTreeListBox::TNames::value_type, bool> { const Sequence< OUString> m_aViews; ::comphelper::UStringMixEqual m_aEqualFunctor; @@ -193,7 +193,7 @@ namespace aRet.first = lhs; const OUString* pIter = m_aViews.getConstArray(); const OUString* pEnd = m_aViews.getConstArray() + m_aViews.getLength(); - aRet.second = ::std::any_of(pIter,pEnd,::std::bind2nd(m_aEqualFunctor,lhs)); + aRet.second = std::any_of(pIter,pEnd,std::bind2nd(m_aEqualFunctor,lhs)); return aRet; } @@ -214,7 +214,7 @@ void OTableTreeListBox::UpdateTableList( try { Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW ); - ::std::transform( pIter, pEnd, + std::transform( pIter, pEnd, aTables.begin(), OViewSetter( _rViews, xMeta->supportsMixedCaseQuotedIdentifiers() ) ); } catch(Exception&) @@ -226,9 +226,9 @@ void OTableTreeListBox::UpdateTableList( namespace { - ::std::vector< OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex ) + std::vector< OUString > lcl_getMetaDataStrings_throw( const Reference< XResultSet >& _rxMetaDataResult, sal_Int32 _nColumnIndex ) { - ::std::vector< OUString > aStrings; + std::vector< OUString > aStrings; Reference< XRow > xRow( _rxMetaDataResult, UNO_QUERY_THROW ); while ( _rxMetaDataResult->next() ) aStrings.push_back( xRow->getString( _nColumnIndex ) ); @@ -254,10 +254,10 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn if (haveVirtualRoot()) { OUString sRootEntryText; - if ( ::std::none_of(_rTables.begin(),_rTables.end(), + if ( std::none_of(_rTables.begin(),_rTables.end(), [] (const TNames::value_type& name) { return !name.second; }) ) sRootEntryText = ModuleRes(STR_ALL_TABLES); - else if ( ::std::none_of(_rTables.begin(),_rTables.end(), + else if ( std::none_of(_rTables.begin(),_rTables.end(), [] (const TNames::value_type& name) { return name.second; }) ) sRootEntryText = ModuleRes(STR_ALL_VIEWS); else @@ -296,12 +296,12 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn // implAddEntry) bool bCatalogs = bSupportsCatalogs && xMeta->isCatalogAtStart(); - ::std::vector< OUString > aFolderNames( lcl_getMetaDataStrings_throw( + std::vector< OUString > aFolderNames( lcl_getMetaDataStrings_throw( bCatalogs ? xMeta->getCatalogs() : xMeta->getSchemas(), 1 ) ); sal_Int32 nFolderType = bCatalogs ? DatabaseObjectContainer::CATALOG : DatabaseObjectContainer::SCHEMA; SvTreeListEntry* pRootEntry = getAllObjectsEntry(); - for ( ::std::vector< OUString >::const_iterator folder = aFolderNames.begin(); + for ( std::vector< OUString >::const_iterator folder = aFolderNames.begin(); folder != aFolderNames.end(); ++folder ) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index bb0ec8c1404e..090f0cb8e287 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -575,7 +575,7 @@ namespace dbaui INetProtocol eProtocol = aParser.GetProtocol(); - ::std::vector< OUString > aToBeCreated; // the to-be-created levels + std::vector< OUString > aToBeCreated; // the to-be-created levels // search a level which exists IS_PATH_EXIST eParentExists = PATH_NOT_EXIST; @@ -615,7 +615,7 @@ namespace dbaui Sequence< Any > aNewDirectoryAttributes(1); // loop - for ( ::std::vector< OUString >::const_reverse_iterator aLocalName = aToBeCreated.rbegin(); + for ( std::vector< OUString >::const_reverse_iterator aLocalName = aToBeCreated.rbegin(); aLocalName != aToBeCreated.rend(); ++aLocalName ) @@ -634,14 +634,14 @@ namespace dbaui return true; } - void OConnectionHelper::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OConnectionHelper::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFT_Connection)); _rControlList.push_back(new ODisableWrapper<PushButton>(m_pPB_Connection)); _rControlList.push_back(new ODisableWrapper<PushButton>(m_pPB_CreateDB)); } - void OConnectionHelper::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OConnectionHelper::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back( new OSaveValueWrapper<Edit>( m_pConnectionURL ) ); } diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index f8b6ac1a87e5..d4d2355c57da 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -57,9 +57,9 @@ namespace dbaui virtual bool PreNotify( NotifyEvent& _rNEvt ) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // setting/retrieving the current connection URL diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index edad0abe55ea..9741273014f5 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -98,12 +98,12 @@ using namespace ::com::sun::star; return bDoEnable; } - void OTextConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OTextConnectionPageSetup::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { OConnectionTabPageSetup::fillControls(_rControlList); m_pTextConnectionHelper->fillControls(_rControlList); } - void OTextConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OTextConnectionPageSetup::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { OConnectionTabPageSetup::fillWindows(_rControlList); m_pTextConnectionHelper->fillWindows(_rControlList); @@ -198,14 +198,14 @@ using namespace ::com::sun::star; fillBool(*_rSet,m_pCBUseSSL,DSID_CONN_LDAP_USESSL,bChangedSomething); return bChangedSomething; } - void OLDAPConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OLDAPConnectionPageSetup::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETHostServer)); _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETBaseDN)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pNFPortNumber)); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pCBUseSSL)); } - void OLDAPConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OLDAPConnectionPageSetup::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHelpText)); _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHostServer)); @@ -293,11 +293,11 @@ using namespace ::com::sun::star; m_pJDBCDatabase->Check(); } - void OMySQLIntroPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) + void OMySQLIntroPageSetup::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } - void OMySQLIntroPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) + void OMySQLIntroPageSetup::fillWindows(std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } @@ -345,12 +345,12 @@ using namespace ::com::sun::star; return VclPtr<MySQLNativeSetupPage>::Create( pParent, _rAttrSet ); } - void MySQLNativeSetupPage::fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) + void MySQLNativeSetupPage::fillControls( std::vector< ISaveValueWrapper* >& _rControlList ) { m_aMySQLSettings->fillControls( _rControlList ); } - void MySQLNativeSetupPage::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) + void MySQLNativeSetupPage::fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new ODisableWrapper< FixedText >( m_pHelpText ) ); m_aMySQLSettings->fillWindows( _rControlList ); @@ -466,14 +466,14 @@ using namespace ::com::sun::star; STR_ORACLE_DRIVERCLASSTEXT); } - void OGeneralSpecialJDBCConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OGeneralSpecialJDBCConnectionPageSetup::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETDatabasename)); _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETDriverClass)); _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETHostname)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pNFPortNumber)); } - void OGeneralSpecialJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OGeneralSpecialJDBCConnectionPageSetup::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHelpText)); _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTDatabasename)); @@ -597,12 +597,12 @@ using namespace ::com::sun::star; OConnectionTabPageSetup::dispose(); } - void OJDBCConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OJDBCConnectionPageSetup::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETDriverClass)); } - void OJDBCConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OJDBCConnectionPageSetup::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTDriverClass)); } @@ -711,11 +711,11 @@ using namespace ::com::sun::star; OConnectionTabPageSetup::dispose(); } - void OSpreadSheetConnectionPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) + void OSpreadSheetConnectionPageSetup::fillWindows(std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } - void OSpreadSheetConnectionPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OSpreadSheetConnectionPageSetup::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { OConnectionTabPageSetup::fillControls(_rControlList); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pPasswordrequired)); @@ -765,14 +765,14 @@ using namespace ::com::sun::star; OGenericAdministrationPage::dispose(); } - void OAuthentificationPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OAuthentificationPageSetup::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHelpText)); _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTUserName)); _rControlList.push_back(new ODisableWrapper<PushButton>(m_pPBTestConnection)); } - void OAuthentificationPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OAuthentificationPageSetup::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pETUserName)); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pCBPasswordRequired)); @@ -863,7 +863,7 @@ using namespace ::com::sun::star; return m_pCBStartTableWizard->IsChecked() && m_pCBStartTableWizard->IsEnabled(); } - void OFinalDBPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OFinalDBPageSetup::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTFinalHeader)); _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTFinalHelpText)); @@ -871,7 +871,7 @@ using namespace ::com::sun::star; _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTFinalText)); } - void OFinalDBPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OFinalDBPageSetup::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pCBOpenAfterwards)); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pCBStartTableWizard)); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index cbdb3e273e4e..4e4a223a452a 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -48,8 +48,8 @@ namespace dbaui protected: VclPtr<CheckBox> m_pPasswordrequired; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; }; // OTextConnectionPage @@ -66,8 +66,8 @@ namespace dbaui protected: virtual bool prepareLeave() override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; bool checkTestConnection() override; private: @@ -87,8 +87,8 @@ namespace dbaui protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; private: VclPtr<FixedText> m_pFTHelpText; @@ -117,8 +117,8 @@ namespace dbaui static VclPtr<OGenericAdministrationPage> Create( vcl::Window* pParent, const SfxItemSet& _rAttrSet ); protected: - virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) override; - virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) override; + virtual void fillControls( std::vector< ISaveValueWrapper* >& _rControlList ) override; + virtual void fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) override; virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; @@ -145,8 +145,8 @@ namespace dbaui protected: virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; virtual void callModifiedHdl(void* pControl = nullptr) override; DECL_LINK(OnTestJavaClickHdl, Button*, void); @@ -182,8 +182,8 @@ namespace dbaui virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; DECL_LINK(OnTestJavaClickHdl, Button*, void); DECL_LINK(OnEditModified, Edit&, void); @@ -214,8 +214,8 @@ namespace dbaui protected: virtual bool FillItemSet(SfxItemSet* _rSet) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; private: VclPtr<RadioButton> m_pODBCDatabase; @@ -246,8 +246,8 @@ namespace dbaui protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; }; // OFinalDBPageSetup @@ -277,8 +277,8 @@ namespace dbaui DECL_LINK(OnOpenSelected, Button*, void); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 357b7e23fc20..a192a99daf06 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -217,7 +217,7 @@ bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< PropertyVal if (!m_pItemSetHelper->getOutputSet()) return false; - ::std::vector< PropertyValue > aReturn; + std::vector< PropertyValue > aReturn; // collecting this in a vector because it has a push_back, in opposite to sequences // user: DSID_USER -> "user" @@ -348,9 +348,9 @@ void ODbDataSourceAdministrationHelper::clearPassword() m_pItemSetHelper->getWriteOutputSet()->ClearItem(DSID_PASSWORD); } -::std::pair< Reference<XConnection>,sal_Bool> ODbDataSourceAdministrationHelper::createConnection() +std::pair< Reference<XConnection>,sal_Bool> ODbDataSourceAdministrationHelper::createConnection() { - ::std::pair< Reference<XConnection>,sal_Bool> aRet; + std::pair< Reference<XConnection>,sal_Bool> aRet; aRet.second = false; Sequence< PropertyValue > aConnectionParams; if ( getCurrentSettings(aConnectionParams) ) @@ -709,14 +709,14 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS // first determine which of all the items are relevant for the data source (depends on the connection url) OUString eType = getDatasourceType(_rSource); - ::std::vector< sal_Int32> aDetailIds; + std::vector< sal_Int32> aDetailIds; ODriversSettings::getSupportedIndirectSettings(eType, getORB(), aDetailIds); // collect the translated property values for the relevant items PropertyValueSet aRelevantSettings; MapInt2String::const_iterator aTranslation; - ::std::vector< sal_Int32>::const_iterator aDetailsEnd = aDetailIds.end(); - for (::std::vector< sal_Int32>::const_iterator aIter = aDetailIds.begin();aIter != aDetailsEnd ; ++aIter) + std::vector< sal_Int32>::const_iterator aDetailsEnd = aDetailIds.end(); + for (std::vector< sal_Int32>::const_iterator aIter = aDetailIds.begin();aIter != aDetailsEnd ; ++aIter) { const SfxPoolItem* pCurrent = _rSource.GetItem((sal_uInt16)*aIter); aTranslation = m_aIndirectPropTranslator.find(*aIter); @@ -771,13 +771,13 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS // for this, we need a string-controlled quick access to m_aIndirectPropTranslator StringSet aIndirectProps; - ::std::transform(m_aIndirectPropTranslator.begin(), + std::transform(m_aIndirectPropTranslator.begin(), m_aIndirectPropTranslator.end(), - ::std::insert_iterator<StringSet>(aIndirectProps,aIndirectProps.begin()), + std::insert_iterator<StringSet>(aIndirectProps,aIndirectProps.begin()), ::o3tl::select2nd< MapInt2String::value_type >()); // now check the to-be-preserved props - ::std::vector< sal_Int32 > aRemoveIndexes; + std::vector< sal_Int32 > aRemoveIndexes; sal_Int32 nPositionCorrector = 0; MapInt2String::const_iterator aPreservedEnd = aPreservedSettings.end(); for ( MapInt2String::const_iterator aPreserved = aPreservedSettings.begin(); @@ -792,8 +792,8 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS } } // now finally remove all such props - ::std::vector< sal_Int32 >::const_iterator aRemoveEnd = aRemoveIndexes.end(); - for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); + std::vector< sal_Int32 >::const_iterator aRemoveEnd = aRemoveIndexes.end(); + for ( std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin(); aRemoveIndex != aRemoveEnd; ++aRemoveIndex ) diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 7d6e90882e73..e3ddd58d59d1 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -64,7 +64,7 @@ namespace dbaui css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Any m_aDataSourceOrName; - typedef ::std::set< OUString > StringSet; + typedef std::set< OUString > StringSet; typedef StringSet::const_iterator ConstStringSetIterator; MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source) @@ -94,7 +94,7 @@ namespace dbaui /** creates a new connection. The caller is responsible to dispose it !!!! */ - ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection(); + std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection(); /** return the corresponding driver for the selected URL */ diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index 315d759e03e4..b553697a88f0 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::beans::NamedValue; using namespace dbaui; -void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext, ::std::vector< sal_Int32>& _out_rDetailsIds ) +void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext, std::vector< sal_Int32>& _out_rDetailsIds ) { // for a number of settings, we do not need to use hard-coded here, but can ask a // central DataSourceUI instance. @@ -67,7 +67,7 @@ void ODriversSettings::getSupportedIndirectSettings( const OUString& _sURLPrefix } } #endif - typedef ::std::pair<sal_uInt16, OUString> TProperties; + typedef std::pair<sal_uInt16, OUString> TProperties; TProperties aProps[] = { TProperties(DSID_SHOWDELETEDROWS,OUString("ShowDeleted")) ,TProperties(DSID_CHARSET,OUString("CharSet")) ,TProperties(DSID_FIELDDELIMITER,OUString("FieldDelimiter")) diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index bb021857f951..7698927927f7 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -41,7 +41,7 @@ namespace dbaui @param _out_rDetailsIds Will be filled. */ - static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext,::std::vector< sal_Int32>& _out_rDetailsIds ); + static void getSupportedIndirectSettings( const OUString& _sURLPrefix,const css::uno::Reference< css::uno::XComponentContext >& _xContext,std::vector< sal_Int32>& _out_rDetailsIds ); /** Creates the detail page for ado */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 184a2c7c3245..6e8316400133 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -181,7 +181,7 @@ namespace dbaui m_aGetExtensionHandler.Call(this); } - void OTextConnectionHelper::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OTextConnectionHelper::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new OSaveValueWrapper<ComboBox>(m_pFieldSeparator)); _rControlList.push_back(new OSaveValueWrapper<ComboBox>(m_pTextSeparator)); @@ -191,7 +191,7 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<ListBox>(m_pCharSet)); } - void OTextConnectionHelper::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OTextConnectionHelper::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFieldSeparatorLabel)); _rControlList.push_back(new ODisableWrapper<FixedText>(m_pTextSeparatorLabel)); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 473df12b6fcb..0f33c0f23c4c 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -86,8 +86,8 @@ namespace dbaui public: void implInitControls(const SfxItemSet& _rSet, bool _bValid); - void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList); - void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList); + void fillControls(std::vector< ISaveValueWrapper* >& _rControlList); + void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList); void SetClickHandler(const Link<OTextConnectionHelper*, void>& _rHandler) { m_aGetExtensionHandler = _rHandler; } OUString GetExtension(); bool FillItemSet( SfxItemSet& rSet, const bool bChangedSomething ); diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index ce481b0c6ed8..7fc0ec9f483f 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -287,11 +287,11 @@ OUString OUserAdmin::GetUser() return m_pUSER->GetSelectEntry(); } -void OUserAdmin::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) +void OUserAdmin::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } -void OUserAdmin::fillWindows(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) +void OUserAdmin::fillWindows(std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 80c536b5714e..480a5616bfda 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -72,10 +72,10 @@ public: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_USERADMIN_HXX diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 47d9f13bad92..fe2e86a95967 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -139,14 +139,14 @@ namespace dbaui { return m_pItemSet; } - ::std::pair< Reference<XConnection>,sal_Bool> OUserAdminDlg::createConnection() + std::pair< Reference<XConnection>,sal_Bool> OUserAdminDlg::createConnection() { if ( !m_xConnection.is() ) { m_xConnection = m_pImpl->createConnection().first; m_bOwnConnection = m_xConnection.is(); } - return ::std::pair< Reference<XConnection>,sal_Bool> (m_xConnection,false); + return std::pair< Reference<XConnection>,sal_Bool> (m_xConnection,false); } Reference< XComponentContext > OUserAdminDlg::getORB() const { diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 6fa310360a1b..082d45b810e7 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -201,7 +201,7 @@ namespace dbaui TabPage::dispose(); } - void MySQLNativeSettings::fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) + void MySQLNativeSettings::fillControls( std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new OSaveValueWrapper< Edit >( m_pDatabaseName ) ); _rControlList.push_back( new OSaveValueWrapper< Edit >( m_pHostName ) ); @@ -210,7 +210,7 @@ namespace dbaui _rControlList.push_back( new OSaveValueWrapper< Edit >( m_pNamedPipe ) ); } - void MySQLNativeSettings::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) + void MySQLNativeSettings::fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new ODisableWrapper< FixedText >( m_pDatabaseNameLabel ) ); _rControlList.push_back( new ODisableWrapper< FixedText >( m_pHostNameLabel ) ); diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index fcd9cd32b9b9..4e7618cfa84c 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -57,8 +57,8 @@ namespace dbaui MySQLNativeSettings( vcl::Window& _rParent, const Link<void*,void>& _rControlModificationLink ); virtual ~MySQLNativeSettings() override; virtual void dispose() override; - void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ); - void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ); + void fillControls( std::vector< ISaveValueWrapper* >& _rControlList ); + void fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ); bool FillItemSet( SfxItemSet* _rCoreAttrs ); void implInitControls( const SfxItemSet& _rSet ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index bd7c6b6a3ec5..ec0ab9518dc9 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -151,7 +151,7 @@ namespace dbaui bool bValid, bReadonly; getFlags(_rSet, bValid, bReadonly); - ::std::vector< ISaveValueWrapper* > aControlList; + std::vector< ISaveValueWrapper* > aControlList; if ( _bSaveValue ) { fillControls(aControlList); @@ -240,7 +240,7 @@ namespace dbaui bool bShowMessage = true; try { - ::std::pair< Reference<XConnection>,sal_Bool> aConnectionPair = m_pAdminDialog->createConnection(); + std::pair< Reference<XConnection>,sal_Bool> aConnectionPair = m_pAdminDialog->createConnection(); bShowMessage = aConnectionPair.second; bSuccess = aConnectionPair.first.is(); ::comphelper::disposeComponent(aConnectionPair.first); diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 7684fd1c545f..fd2e66c68bd9 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -154,14 +154,14 @@ namespace dbaui The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) = 0; /** will be called inside <method>implInitControls</method> to disable if necessary @param _rControlList The list must be filled with the controls. It is not allowed to clear the list before pusching data into it. */ - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) = 0; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) = 0; public: /** fills the Boolean value into the item set when the value changed. diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 997091e06cbb..8cbd1198bcb3 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -183,13 +183,13 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews ) { const OUString* pTableBegin = sTables.getConstArray(); const OUString* pTableEnd = pTableBegin + sTables.getLength(); - ::std::vector< OUString > aTables(pTableBegin,pTableEnd); + std::vector< OUString > aTables(pTableBegin,pTableEnd); const OUString* pViewBegin = sViews.getConstArray(); const OUString* pViewEnd = pViewBegin + sViews.getLength(); ::comphelper::UStringMixEqual aEqualFunctor; for(;pViewBegin != pViewEnd;++pViewBegin) - aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end()); + aTables.erase(std::remove_if(aTables.begin(),aTables.end(),std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end()); sTables = Sequence< OUString>(aTables.data(), aTables.size()); sViews = Sequence< OUString>(); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 27e0a5db8261..4a809983887c 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -200,7 +200,7 @@ namespace dbaui } } - void SpecialSettingsPage::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) + void SpecialSettingsPage::fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) { if ( m_bHasBooleanComparisonMode ) { @@ -212,7 +212,7 @@ namespace dbaui } } - void SpecialSettingsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void SpecialSettingsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { for ( BooleanSettingDescs::const_iterator setting = m_aBooleanSettings.begin(); setting != m_aBooleanSettings.end(); @@ -364,12 +364,12 @@ namespace dbaui OGenericAdministrationPage::dispose(); } - void GeneratedValuesPage::fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList ) + void GeneratedValuesPage::fillWindows( std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new ODisableWrapper< VclFrame >( m_pAutoFrame ) ); } - void GeneratedValuesPage::fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList ) + void GeneratedValuesPage::fillControls( std::vector< ISaveValueWrapper* >& _rControlList ) { _rControlList.push_back( new OSaveValueWrapper< CheckBox >( m_pAutoRetrievingEnabled ) ); _rControlList.push_back( new OSaveValueWrapper< Edit >( m_pAutoIncrement ) ); @@ -503,7 +503,7 @@ namespace dbaui return m_pExampleSet; } - ::std::pair< Reference< XConnection >, sal_Bool > AdvancedSettingsDialog::createConnection() + std::pair< Reference< XConnection >, sal_Bool > AdvancedSettingsDialog::createConnection() { return m_pImpl->createConnection(); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index f7c80977352d..a30cfc805aa7 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -33,7 +33,7 @@ namespace dbaui { struct BooleanSettingDesc; - typedef ::std::vector< BooleanSettingDesc > BooleanSettingDescs; + typedef std::vector< BooleanSettingDesc > BooleanSettingDescs; // SpecialSettingsPage // implements the "Special Settings" page of the advanced database settings @@ -84,10 +84,10 @@ namespace dbaui virtual void implInitControls (const SfxItemSet& _rSet, bool _bSaveValue ) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; private: void impl_initBooleanSettings(); @@ -123,10 +123,10 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; }; } diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 8a7d4879d17b..bbf994354a42 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -270,7 +270,7 @@ SfxItemSet* ODbAdminDialog::getWriteOutputSet() return m_pExampleSet; } -::std::pair< Reference<XConnection>,sal_Bool> ODbAdminDialog::createConnection() +std::pair< Reference<XConnection>,sal_Bool> ODbAdminDialog::createConnection() { return m_pImpl->createConnection(); } diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 18dce51c1dbd..79f10f3ca6fa 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -300,7 +300,7 @@ void ODbaseIndexDialog::Init() OUString aIndexExt("ndx"); OUString aTableExt("dbf"); - ::std::vector< OUString > aUsedIndexes; + std::vector< OUString > aUsedIndexes; const OUString *pBegin = aFolderContent.getConstArray(); const OUString *pEnd = pBegin + aFolderContent.getLength(); @@ -353,7 +353,7 @@ void ODbaseIndexDialog::Init() } } - for ( ::std::vector< OUString >::const_iterator aUsedIndex = aUsedIndexes.begin(); + for ( std::vector< OUString >::const_iterator aUsedIndex = aUsedIndexes.begin(); aUsedIndex != aUsedIndexes.end(); ++aUsedIndex ) diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index d1fa3a04f0cb..0f90c5b5ce14 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -46,7 +46,7 @@ public: const OUString& GetIndexFileName() const { return aIndexFileName; } }; -typedef ::std::list< OTableIndex > TableIndexList; +typedef std::list< OTableIndex > TableIndexList; // OTableInfo class ODbaseIndexDialog; @@ -65,7 +65,7 @@ public: void WriteInfFile( const OUString& rDSN ) const; }; -typedef ::std::list< OTableInfo > TableInfoList; +typedef std::list< OTableInfo > TableInfoList; // IndexDialog class ODbaseIndexDialog : public ModalDialog diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 669a607c669a..be43ef07a322 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -202,7 +202,7 @@ SfxItemSet* ODbTypeWizDialog::getWriteOutputSet() return m_pOutSet; } -::std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialog::createConnection() +std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialog::createConnection() { return m_pImpl->createConnection(); } diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 910a0950b3bf..bf1b7c98c2fd 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -400,7 +400,7 @@ SfxItemSet* ODbTypeWizDialogSetup::getWriteOutputSet() return m_pOutSet; } -::std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialogSetup::createConnection() +std::pair< Reference<XConnection>,sal_Bool> ODbTypeWizDialogSetup::createConnection() { return m_pImpl->createConnection(); } diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 66209cf6f443..6cdc6efde692 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -118,7 +118,7 @@ namespace dbaui OGenericAdministrationPage::dispose(); } - void OCommonBehaviourTabPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OCommonBehaviourTabPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions) { @@ -130,7 +130,7 @@ namespace dbaui _rControlList.push_back(new ODisableWrapper<FixedText>(m_pCharsetLabel)); } } - void OCommonBehaviourTabPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OCommonBehaviourTabPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions) _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pOptions)); @@ -362,14 +362,14 @@ namespace dbaui return bChangedSomething; } - void OUserDriverDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OUserDriverDetailsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pEDHostname)); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pUseCatalog)); _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pNFPortNumber)); } - void OUserDriverDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OUserDriverDetailsPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows(_rControlList); _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHostname)); @@ -586,7 +586,7 @@ namespace dbaui OCommonBehaviourTabPage::dispose(); } - void MySQLNativePage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void MySQLNativePage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls( _rControlList ); m_aMySQLSettings->fillControls( _rControlList ); @@ -594,7 +594,7 @@ namespace dbaui _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pUserName)); _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pPasswordRequired)); } - void MySQLNativePage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void MySQLNativePage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows( _rControlList ); m_aMySQLSettings->fillWindows( _rControlList); @@ -768,13 +768,13 @@ namespace dbaui { return VclPtr<OTextDetailsPage>::Create( pParent, *_rAttrSet ); } - void OTextDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OTextDetailsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); m_pTextConnectionHelper->fillControls(_rControlList); } - void OTextDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OTextDetailsPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillWindows(_rControlList); m_pTextConnectionHelper->fillWindows(_rControlList); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index bbc53088c6bf..d6db15724cfc 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -82,10 +82,10 @@ namespace dbaui virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; private: DECL_LINK(CharsetSelectHdl, ListBox&, void); }; @@ -146,8 +146,8 @@ namespace dbaui virtual void dispose() override; protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; private: VclPtr<FixedText> m_pFTHostname; VclPtr<Edit> m_pEDHostname; @@ -218,8 +218,8 @@ namespace dbaui protected: virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; }; // OOdbcDetailsPage @@ -259,8 +259,8 @@ namespace dbaui virtual bool prepareLeave() override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; private: }; diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 0de46b163af3..a2ad2b40c2d5 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -46,7 +46,7 @@ protected: VclPtr<CancelButton> m_pCancel; #ifdef HAVE_ODBC_ADMINISTRATION VclPtr<PushButton> m_pManageDatasources; - ::std::unique_ptr< OOdbcManagement > + std::unique_ptr< OOdbcManagement > m_pODBCManagement; #endif diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index cdd0bc258557..54d93741a1b0 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -94,9 +94,9 @@ namespace dbaui DisplayedType( const OUString& _eType, const OUString& _rDisplayName ) : eType( _eType ), sDisplayName( _rDisplayName ) { } }; - typedef ::std::vector< DisplayedType > DisplayedTypes; + typedef std::vector< DisplayedType > DisplayedTypes; - struct DisplayedTypeLess : ::std::binary_function< DisplayedType, DisplayedType, bool > + struct DisplayedTypeLess : std::binary_function< DisplayedType, DisplayedType, bool > { bool operator() ( const DisplayedType& _rLHS, const DisplayedType& _rRHS ) { @@ -133,7 +133,7 @@ namespace dbaui } } } - ::std::sort( aDisplayedTypes.begin(), aDisplayedTypes.end(), DisplayedTypeLess() ); + std::sort( aDisplayedTypes.begin(), aDisplayedTypes.end(), DisplayedTypeLess() ); DisplayedTypes::const_iterator aDisplayEnd = aDisplayedTypes.end(); for ( DisplayedTypes::const_iterator loop = aDisplayedTypes.begin(); loop != aDisplayEnd; @@ -172,7 +172,7 @@ namespace dbaui } } } - ::std::sort( aDisplayedTypes.begin(), aDisplayedTypes.end(), DisplayedTypeLess() ); + std::sort( aDisplayedTypes.begin(), aDisplayedTypes.end(), DisplayedTypeLess() ); DisplayedTypes::const_iterator aDisplayEnd = aDisplayedTypes.end(); for ( DisplayedTypes::const_iterator loop = aDisplayedTypes.begin(); loop != aDisplayEnd; @@ -377,12 +377,12 @@ namespace dbaui m_aEmbeddedURLPrefixes[nPos] = _sType; } - void OGeneralPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OGeneralPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back( new ODisableWrapper<FixedText>( m_pSpecialMessage ) ); } - void OGeneralPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) + void OGeneralPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back( new OSaveValueWrapper<ListBox>( m_pDatasourceType ) ); } diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index b7a5246dd6f4..7f3628a9eb1c 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -61,7 +61,7 @@ namespace dbaui ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance - ::std::vector< OUString> + std::vector< OUString> m_aURLPrefixes; public: @@ -83,9 +83,9 @@ namespace dbaui virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ); // <method>OGenericAdministrationPage::fillControls</method> - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; // <method>OGenericAdministrationPage::fillWindows</method> - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; void onTypeSelected(const OUString& _sURLPrefix); void initializeTypeList(); @@ -178,7 +178,7 @@ namespace dbaui virtual OUString getDatasourceName( const SfxItemSet& _rSet ) override; virtual bool approveDatasourceType( ::dbaccess::DATASOURCE_TYPE eType, OUString& _inout_rDisplayName ) override; - ::std::vector< OUString> + std::vector< OUString> m_aEmbeddedURLPrefixes; OUString getEmbeddedDBName( const SfxItemSet& _rSet ); diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 04af12d08ab6..41e9806522f6 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -88,7 +88,7 @@ protected: class ProcessTerminationWait; class OOdbcManagement { - ::std::unique_ptr< ProcessTerminationWait > m_pProcessWait; + std::unique_ptr< ProcessTerminationWait > m_pProcessWait; Link<void*,void> m_aAsyncFinishCallback; public: diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 1933c916e500..8cd2ee05a6c8 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -186,7 +186,7 @@ namespace ); } - typedef ::std::vector< ExceptionDisplayInfo > ExceptionDisplayChain; + typedef std::vector< ExceptionDisplayInfo > ExceptionDisplayChain; /// strips the [OOoBase] vendor identifier from the given error message, if applicable OUString lcl_stripOOoBaseVendor( const OUString& _rErrorMessage ) diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 365716964d6c..e1d15840ba59 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -566,11 +566,11 @@ namespace dbaui return true; } - void OTableSubscriptionPage::fillControls(::std::vector< ISaveValueWrapper* >& /*_rControlList*/) + void OTableSubscriptionPage::fillControls(std::vector< ISaveValueWrapper* >& /*_rControlList*/) { } - void OTableSubscriptionPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) + void OTableSubscriptionPage::fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) { _rControlList.push_back(new ODisableWrapper<VclContainer>(m_pTables)); } diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 001248ed203a..2e1bdaa25301 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -61,8 +61,8 @@ namespace dbaui virtual void dispose() override; protected: - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) override; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillControls(std::vector< ISaveValueWrapper* >& _rControlList) override; + virtual void fillWindows(std::vector< ISaveValueWrapper* >& _rControlList) override; DECL_LINK( OnTreeEntryCompare, const SvSortData&, sal_Int32 ); DECL_LINK( OnTreeEntryChecked, void*, void ); diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 7c7f63a12e4e..1b6d4a5fd8a8 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -35,7 +35,7 @@ namespace dbaui mutable css::uno::Reference< css::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier OTypeInfoMap m_aDestTypeInfo; - ::std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; + std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; mutable TOTypeInfoSP m_pTypeInfo; // default type OUString m_sTypeNames; // these type names are the ones out of the resource file diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index 9717c6014878..821c3b063147 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -75,7 +75,7 @@ namespace dbaui }; typedef ::rtl::Reference< OConnectionLineData > OConnectionLineDataRef; - typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec; + typedef std::vector< OConnectionLineDataRef > OConnectionLineDataVec; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEDATA_HXX diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index fccfa99d9c58..a06a1aebcef4 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -60,14 +60,14 @@ namespace dbaui { public: typedef std::map<OUString, OFieldDescription*, ::comphelper::UStringMixLess> TColumns; - typedef ::std::vector<TColumns::const_iterator> TColumnVector; - typedef ::std::vector< ::std::pair<sal_Int32,sal_Int32> > TPositions; + typedef std::vector<TColumns::const_iterator> TColumnVector; + typedef std::vector< std::pair<sal_Int32,sal_Int32> > TPositions; protected: TPositions m_vColumns; ///< columns to be used - ::std::vector<sal_Int32> m_vColumnTypes; ///< ColumnTypes for faster access - ::std::vector<sal_Int32> m_vColumnSize; - ::std::vector<sal_Int16> m_vNumberFormat; + std::vector<sal_Int32> m_vColumnTypes; ///< ColumnTypes for faster access + std::vector<sal_Int32> m_vColumnSize; + std::vector<sal_Int16> m_vNumberFormat; css::lang::Locale m_aLocale; TColumns m_aDestColumns; ///< container for new created columns diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index 9cc898b1f8e5..e8685b42a911 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -51,7 +51,7 @@ namespace dbaui { public: virtual css::uno::Reference< css::uno::XComponentContext > getORB() const = 0; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() = 0; + virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() = 0; virtual css::uno::Reference< css::sdbc::XDriver > getDriver() = 0; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const = 0; virtual void clearPassword() = 0; diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 15cabf9cd9fc..41da7156e667 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -51,7 +51,7 @@ namespace dbaui ::dbtools::SQLExceptionInfo m_aExceptionInfo; VclPtr<OAddTableDlg> m_pAddTableDialog; - ::std::unique_ptr< AddTableDialogContext > m_pDialogContext; + std::unique_ptr< AddTableDialogContext > m_pDialogContext; Point m_aMinimumTableViewSize; // state of a feature. 'feature' may be the handle of a css::util::URL somebody requested a dispatch interface for OR a toolbar slot. diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 343f703a4d19..5ecceca3577f 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -85,7 +85,7 @@ namespace dbaui private: OTableWindowMap m_aTableMap; - ::std::vector<VclPtr<OTableConnection> > m_vTableConnection; + std::vector<VclPtr<OTableConnection> > m_vTableConnection; Idle m_aDragScrollIdle; Rectangle m_aDragRect; @@ -181,7 +181,7 @@ namespace dbaui /** gives a read only access to the connection vector */ - const ::std::vector<VclPtr<OTableConnection> >& getTableConnections() const { return m_vTableConnection; } + const std::vector<VclPtr<OTableConnection> >& getTableConnections() const { return m_vTableConnection; } bool ExistsAConn(const OTableWindow* pFromWin) const; @@ -190,7 +190,7 @@ namespace dbaui @param _pFromWin the table for which connections should be found @return an iterator which can be used to travel all connections of the table */ - ::std::vector<VclPtr<OTableConnection> >::const_iterator getTableConnections(const OTableWindow* _pFromWin) const; + std::vector<VclPtr<OTableConnection> >::const_iterator getTableConnections(const OTableWindow* _pFromWin) const; /** how many connection belongs to single table diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 5f56b3d50212..5d999197a6d7 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -29,7 +29,7 @@ namespace dbaui class ORelationController : public OJoinController { css::uno::Reference< css::container::XNameAccess > m_xTables; - ::std::unique_ptr<WaitObject> m_pWaitObject; + std::unique_ptr<WaitObject> m_pWaitObject; sal_uLong m_nThreadEvent; bool m_bRelationsPossible; protected: diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 61ad0883df9a..50f9f3387a49 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -29,7 +29,7 @@ namespace dbaui { class ORTFReader : public SvRTFParser , public ODatabaseExport { - ::std::vector<sal_Int32> m_vecColor; + std::vector<sal_Int32> m_vecColor; protected: virtual bool CreateTable(int nToken) override; diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 4cf945f64764..e7cb02228dac 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -37,7 +37,7 @@ namespace dbaui class OTableConnection : public vcl::Window { - ::std::vector<OConnectionLine*> m_vConnLine; + std::vector<OConnectionLine*> m_vConnLine; TTableConnectionData::value_type m_pData; VclPtr<OJoinTableView> m_pParent; @@ -89,7 +89,7 @@ namespace dbaui Rectangle GetBoundingRect() const; const TTableConnectionData::value_type& GetData() const { return m_pData; } - const ::std::vector<OConnectionLine*>& GetConnLineList() const { return m_vConnLine; } + const std::vector<OConnectionLine*>& GetConnLineList() const { return m_vConnLine; } inline OJoinTableView* GetParent() const { return m_pParent; } virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect); using Window::Draw; diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 99a4ddcdad78..af5e4abba866 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -98,7 +98,7 @@ namespace dbaui virtual bool Update(){ return true; } }; - typedef ::std::vector< ::std::shared_ptr<OTableConnectionData> > TTableConnectionData; + typedef std::vector< std::shared_ptr<OTableConnectionData> > TTableConnectionData; } #endif diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index bd543443a38d..a6a4b60a22e0 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -39,9 +39,9 @@ namespace dbaui { private: OModuleClient m_aModuleClient; - ::std::vector< std::shared_ptr<OTableRow> > m_vRowList; + std::vector< std::shared_ptr<OTableRow> > m_vRowList; OTypeInfoMap m_aTypeInfo; - ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; + std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; css::uno::Reference< css::beans::XPropertySet > m_xTable; @@ -99,7 +99,7 @@ namespace dbaui virtual void impl_onModifyChanged() override; - inline ::std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; } + inline std::vector< std::shared_ptr<OTableRow> >& getRows() { return m_vRowList; } /// returns the position of the first empty row sal_Int32 getFirstEmptyRowPosition(); diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 1a3c00a47f27..970a08603e36 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -33,7 +33,7 @@ namespace dbaui { class OGenericUnoController; /// unary_function Functor object for class DataFlavorExVector::value_type returntype is bool - struct TAppSupportedSotFunctor : ::std::unary_function<DataFlavorExVector::value_type,bool> + struct TAppSupportedSotFunctor : std::unary_function<DataFlavorExVector::value_type,bool> { ElementType eEntryType; TAppSupportedSotFunctor(const ElementType& _eEntryType) diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index f701f4b1519e..dc5700cae5d1 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -41,7 +41,7 @@ namespace dbaui class OTableFieldDesc : public ::salhelper::SimpleReferenceObject { private: - ::std::vector< OUString > + std::vector< OUString > m_aCriteria; OUString m_aTableName; @@ -118,15 +118,15 @@ namespace dbaui bool HasCriteria() const { - ::std::vector< OUString>::const_iterator aIter = m_aCriteria.begin(); - ::std::vector< OUString>::const_iterator aEnd = m_aCriteria.end(); + std::vector< OUString>::const_iterator aIter = m_aCriteria.begin(); + std::vector< OUString>::const_iterator aEnd = m_aCriteria.end(); for(;aIter != aEnd;++aIter) if(!aIter->isEmpty()) break; return aIter != aEnd; } - const ::std::vector< OUString>& GetCriteria() const { return m_aCriteria; } + const std::vector< OUString>& GetCriteria() const { return m_aCriteria; } void Load( const css::beans::PropertyValue& i_rSettings, const bool i_bIncludingCriteria ); void Save( ::comphelper::NamedValueCollection& o_rSettings, const bool i_bIncludingCriteria ); @@ -144,7 +144,7 @@ namespace dbaui } typedef ::rtl::Reference< OTableFieldDesc> OTableFieldDescRef; - typedef ::std::vector<OTableFieldDescRef> OTableFields; + typedef std::vector<OTableFieldDescRef> OTableFields; } #endif diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index ea931d189385..ee86c291cdad 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -28,9 +28,9 @@ namespace dbaui class OTableRow; class OTableRowExchange : public TransferableHelper { - ::std::vector< std::shared_ptr<OTableRow> > m_vTableRow; + std::vector< std::shared_ptr<OTableRow> > m_vTableRow; public: - OTableRowExchange(const ::std::vector< std::shared_ptr<OTableRow> >& _rvTableRow); + OTableRowExchange(const std::vector< std::shared_ptr<OTableRow> >& _rvTableRow); protected: virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 082ac7085992..9ac631897b97 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -186,7 +186,7 @@ namespace dbaui // do I have connections to the outside? bool ExistsAConn() const; - void EnumValidFields(::std::vector< OUString>& arrstrFields); + void EnumValidFields(std::vector< OUString>& arrstrFields); /** clears the listbox inside. Must be called be the dtor is called. */ diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 382df250e725..968c4657790f 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -90,7 +90,7 @@ namespace dbaui virtual void _disposing( const css::lang::EventObject& _rSource ) override; }; - typedef ::std::vector< std::shared_ptr<OTableWindowData> > TTableWindowData; + typedef std::vector< std::shared_ptr<OTableWindowData> > TTableWindowData; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWDATA_HXX diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index de5082fde84c..5d029fd7977c 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -42,7 +42,7 @@ class ODbDataSourceAdministrationHelper; // OTableSubscriptionDialog class OTableSubscriptionDialog : public SfxSingleTabDialog, public IItemSetHelper { - ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; bool m_bStopExecution; // set when the dialog should not be executed SfxItemSet* m_pOutSet; diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index d97d3a84d2ea..120125be6c89 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -189,8 +189,8 @@ namespace dbaui class ORowSetImportExport : public ODatabaseImportExport { OModuleClient m_aModuleClient; - ::std::vector<sal_Int32> m_aColumnMapping; - ::std::vector<sal_Int32> m_aColumnTypes; + std::vector<sal_Int32> m_aColumnMapping; + std::vector<sal_Int32> m_aColumnTypes; css::uno::Reference< css::sdbc::XResultSetUpdate > m_xTargetResultSetUpdate; css::uno::Reference< css::sdbc::XRowUpdate > m_xTargetRowUpdate; css::uno::Reference< css::sdbc::XResultSetMetaData > m_xTargetResultSetMetaData; diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 9f29f2617e77..66eb7df7d712 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -105,7 +105,7 @@ const sal_uInt16 TYPE_BIT = 31; }; typedef std::shared_ptr<OTypeInfo> TOTypeInfoSP; - typedef ::std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap; + typedef std::multimap<sal_Int32,TOTypeInfoSP> OTypeInfoMap; /** return the most suitable typeinfo for a requested type @param _rTypeInfo contains a map of type to typeinfo @param _nType the requested type diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 18a6c2dbf1c5..e16e8de0c0c0 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -121,7 +121,7 @@ namespace dbaui void fillTypeInfo( const css::uno::Reference< css::sdbc::XConnection>& _rxConnection, const OUString& _rsTypeNames, OTypeInfoMap& _rTypeInfoMap, - ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters); + std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters); /** fill a column with data of a field description @param _rxColumn the column which should be filled diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 3c13172a4692..81cafa3360b2 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -46,7 +46,7 @@ namespace dbaui class OUserAdminDlg : public SfxTabDialog, public IItemSetHelper, public IDatabaseSettingsDialog,public dbaui::OModuleClient { OModuleClient m_aModuleClient; - ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pItemSet; css::uno::Reference< css::sdbc::XConnection> m_xConnection; bool m_bOwnConnection; @@ -69,7 +69,7 @@ namespace dbaui // forwards to ODbDataSourceAdministrationHelper virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; virtual void clearPassword() override; diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index df829da3633a..9f08c6ca19de 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -47,11 +47,11 @@ namespace dbaui static void clearListBox(ListBox& _rListBox); static void fillColumns( ListBox* pRight, - ::std::vector< OUString> &_rRightColumns); + std::vector< OUString> &_rRightColumns); void createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, - ::std::vector< OUString>& _rRightColumns, + std::vector< OUString>& _rRightColumns, const OUString& _sColumnName, const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, @@ -59,7 +59,7 @@ namespace dbaui void moveColumn( ListBox* _pRight, ListBox* _pLeft, - ::std::vector< OUString>& _rRightColumns, + std::vector< OUString>& _rRightColumns, const OUString& _sColumnName, const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 6d2488a658c9..f8042af896e9 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -45,7 +45,7 @@ namespace dbaui { - typedef ::std::unary_function< OUString,bool> TColumnFindFunctorType; + typedef std::unary_function< OUString,bool> TColumnFindFunctorType; class TColumnFindFunctor : public TColumnFindFunctorType { public: @@ -75,9 +75,9 @@ namespace dbaui class TMultiListBoxEntryFindFunctor : public TColumnFindFunctor { ::comphelper::UStringMixEqual m_aCase; - ::std::vector< OUString>* m_pVector; + std::vector< OUString>* m_pVector; public: - TMultiListBoxEntryFindFunctor(::std::vector< OUString>* _pVector, + TMultiListBoxEntryFindFunctor(std::vector< OUString>* _pVector, const ::comphelper::UStringMixEqual& _aCase) :m_aCase(_aCase) ,m_pVector(_pVector) @@ -88,8 +88,8 @@ namespace dbaui bool operator()(const OUString& _sColumnName) const override { - return ::std::any_of(m_pVector->begin(),m_pVector->end(), - ::std::bind2nd(m_aCase, _sColumnName)); + return std::any_of(m_pVector->begin(),m_pVector->end(), + std::bind2nd(m_aCase, _sColumnName)); } }; @@ -183,7 +183,7 @@ namespace dbaui OUString m_sTableCatalog; OUString m_sTableSchema; OUString m_sTableBareName; - ::std::vector< OFieldDescription > m_aColumnInfo; + std::vector< OFieldDescription > m_aColumnInfo; ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > m_xStatement; public: @@ -246,13 +246,13 @@ namespace dbaui VclPtr<PushButton> m_pbFinish; OTypeInfoMap m_aTypeInfo; - ::std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; + std::vector<OTypeInfoMap::iterator> m_aTypeInfoIndex; OTypeInfoMap m_aDestTypeInfo; - ::std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; + std::vector<OTypeInfoMap::iterator> m_aDestTypeInfoIndex; TNameMapping m_mNameMapping; ODatabaseExport::TPositions m_vColumnPos; - ::std::vector<sal_Int32> m_vColumnTypes; + std::vector<sal_Int32> m_vColumnTypes; css::uno::Reference< css::sdbc::XConnection > m_xDestConnection; @@ -334,7 +334,7 @@ namespace dbaui // returns a vector where the position of a column and if the column is in the selection // when not the value is COLUMN_POSITION_NOT_FOUND == (sal_uInt32)-1 const ODatabaseExport::TPositions& GetColumnPositions() const { return m_vColumnPos; } - const ::std::vector<sal_Int32>& GetColumnTypes() const { return m_vColumnTypes; } + const std::vector<sal_Int32>& GetColumnTypes() const { return m_vColumnTypes; } bool UseHeaderLine() const { return m_bUseHeaderLine; } void setUseHeaderLine(bool _bUseHeaderLine) { m_bUseHeaderLine = _bUseHeaderLine; } diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 2674cb4f9069..3e94b4f41cb1 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -39,7 +39,7 @@ namespace dbaui ,public IDatabaseSettingsDialog { OModuleClient m_aModuleClient; - ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; protected: virtual void PageCreated(sal_uInt16 _nId, SfxTabPage& _rPage) override; @@ -63,7 +63,7 @@ namespace dbaui // forwards to ODbDataSourceAdministrationHelper virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; virtual void clearPassword() override; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 64fe97afc2c1..1ccc6053caf8 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -48,10 +48,10 @@ class ODbDataSourceAdministrationHelper; class ODbAdminDialog : public SfxTabDialog , public IItemSetHelper, public IDatabaseSettingsDialog { private: - typedef ::std::stack< sal_Int32 > PageStack; + typedef std::stack< sal_Int32 > PageStack; PageStack m_aCurrentDetailPages; // ids of all currently enabled (type-dependent) detail pages - ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; bool m_bApplied : 1; /// sal_True if any changes have been applied while the dialog was executing bool m_bUIEnabled : 1; /// <TRUE/> if the UI is enabled, false otherwise. Cannot be switched back to <TRUE/>, once it is <FALSE/> @@ -88,7 +88,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; virtual void clearPassword() override; diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index eb5e6eb53aba..956158f40e3f 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -56,7 +56,7 @@ class ODbTypeWizDialog : public svt::OWizardMachine , public IItemSetHelper, pub { private: OModuleClient m_aModuleClient; - ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance @@ -79,7 +79,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; virtual void clearPassword() override; diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 103b26299cf2..18cdcb9891c7 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -61,7 +61,7 @@ class ODbTypeWizDialogSetup : public svt::RoadmapWizard , public IItemSetHelper, private: OModuleClient m_aModuleClient; - ::std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; + std::unique_ptr<ODbDataSourceAdministrationHelper> m_pImpl; SfxItemSet* m_pOutSet; OUString m_sURL; OUString m_sOldURL; @@ -106,7 +106,7 @@ public: // forwards to ODbDataSourceAdministrationHelper virtual css::uno::Reference< css::uno::XComponentContext > getORB() const override; - virtual ::std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; + virtual std::pair< css::uno::Reference< css::sdbc::XConnection >,sal_Bool> createConnection() override; virtual css::uno::Reference< css::sdbc::XDriver > getDriver() override; virtual OUString getDatasourceType(const SfxItemSet& _rSet) const override; virtual void clearPassword() override; diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 9e6d74e62dd7..21c2f083cb10 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -57,7 +57,7 @@ namespace dbaui VclPtr<VclMultiLineEdit> m_pOutput; VclPtr<PushButton> m_pClose; - typedef ::std::deque< OUString > StringQueue; + typedef std::deque< OUString > StringQueue; StringQueue m_aStatementHistory; // previous statements StringQueue m_aNormalizedHistory; // previous statements, normalized to be used in the list box diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index d7e62e5345bb..9f88e0f7eb1a 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -74,7 +74,7 @@ namespace dbaui class FeatureSet { public: - typedef ::std::set< ItemID >::const_iterator const_iterator; + typedef std::set< ItemID >::const_iterator const_iterator; public: inline FeatureSet() { } @@ -89,7 +89,7 @@ namespace dbaui inline const_iterator end() const { return m_aContent.end(); } private: - ::std::set< ItemID > m_aContent; + std::set< ItemID > m_aContent; }; inline bool FeatureSet::supportsGeneratedValues() const diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index d75ba04195dd..20aaf70cac7d 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -141,8 +141,8 @@ namespace dbaui // hierarchy administration css::uno::Reference< css::uno::XInterface > m_xParent; - ::std::vector< css::uno::Reference< css::form::XFormComponent > > m_aChildren; - ::std::vector< OUString > m_aChildNames; + std::vector< css::uno::Reference< css::form::XFormComponent > > m_aChildren; + std::vector< OUString > m_aChildNames; // properties OUString m_sName; diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 5b4515c1834c..6ac17f1b1920 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -50,8 +50,8 @@ namespace dbaui class OpenDocumentListBox : public ListBox { private: - typedef ::std::pair< OUString, OUString > StringPair; - typedef ::std::map< sal_uInt16, StringPair > MapIndexToStringPair; + typedef std::pair< OUString, OUString > StringPair; + typedef std::map< sal_uInt16, StringPair > MapIndexToStringPair; MapIndexToStringPair m_aURLs; diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx index 9699e5ad814e..51732053adf9 100644 --- a/dbaccess/source/ui/inc/propertystorage.hxx +++ b/dbaccess/source/ui/inc/propertystorage.hxx @@ -48,7 +48,7 @@ namespace dbaui const sal_uInt16 m_nItemID; }; - typedef ::std::map< sal_Int32, std::shared_ptr< SetItemPropertyStorage > > PropertyValues; + typedef std::map< sal_Int32, std::shared_ptr< SetItemPropertyStorage > > PropertyValues; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 3647249b07ad..beff20b48c31 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star { namespace dbaui { - struct SbaURLCompare : public ::std::binary_function< css::util::URL, css::util::URL, bool> + struct SbaURLCompare : public std::binary_function< css::util::URL, css::util::URL, bool> { bool operator() (const css::util::URL& x, const css::util::URL& y) const { return x.Complete == y.Complete; } }; @@ -146,7 +146,7 @@ namespace dbaui css::util::URL aURL; css::uno::Sequence< css::beans::PropertyValue > aArgs; }; - ::std::queue< DispatchArgs > m_aDispatchArgs; + std::queue< DispatchArgs > m_aDispatchArgs; DECL_LINK( OnDispatchEvent, void*, void ); // for dynamic states of our 4 dispatchable URLs diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx index 99b4f993f197..88aeeae25a8a 100644 --- a/dbaccess/source/ui/inc/singledoccontroller.hxx +++ b/dbaccess/source/ui/inc/singledoccontroller.hxx @@ -70,7 +70,7 @@ namespace dbaui using OSingleDocumentController_Base::disposing; private: - ::std::unique_ptr< OSingleDocumentController_Data > m_pData; + std::unique_ptr< OSingleDocumentController_Data > m_pData; }; } // namespace dbaui diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 490fcff79cd8..cff7777bcde4 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -50,7 +50,7 @@ class OSQLMessageBox : public ButtonDialog VclPtr<FixedText> m_aMessage; OUString m_sHelpURL; - ::std::unique_ptr< SQLMessageBox_Impl > m_pImpl; + std::unique_ptr< SQLMessageBox_Impl > m_pImpl; public: enum MessageType diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index d07a455db03e..348ea519aa2d 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -50,8 +50,8 @@ public: void init(bool bVirtualRoot) { m_bVirtualRoot = bVirtualRoot; } - typedef ::std::pair< OUString, bool > TTableViewName; - typedef ::std::vector< TTableViewName > TNames; + typedef std::pair< OUString, bool > TTableViewName; + typedef std::vector< TTableViewName > TNames; void suppressEmptyFolders() { m_bNoEmptyFolders = true; } diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 178af0838ad3..83fcdc5385ee 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -85,7 +85,7 @@ namespace dbaui ExternalFeature( const css::util::URL& _rURL ) : aURL( _rURL ), bEnabled( false ) { } }; - typedef ::std::map< sal_uInt16, ExternalFeature > ExternalFeaturesMap; + typedef std::map< sal_uInt16, ExternalFeature > ExternalFeaturesMap; ExternalFeaturesMap m_aExternalFeatures; svx::ODataAccessDescriptor m_aDocumentDataSource; @@ -325,7 +325,7 @@ namespace dbaui bool getExistentConnectionFor( SvTreeListEntry* _pDSEntry, SharedConnection& _rConnection ); /** returns an image provider which works with the connection belonging to the given entry */ - ::std::unique_ptr< ImageProvider > + std::unique_ptr< ImageProvider > getImageProviderFor( SvTreeListEntry* _pAnyEntry ); void implAdministrate( SvTreeListEntry* _pApplyTo ); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 446fb5bca164..02d9322ed598 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -182,8 +182,8 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, if(xSet.is()) { ::connectivity::ORowSetValue aValue; - ::std::vector<sal_Int32> aTypes; - ::std::vector<sal_Bool> aNullable; + std::vector<sal_Int32> aTypes; + std::vector<sal_Bool> aNullable; Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xSet,UNO_QUERY_THROW)->getMetaData(); Reference<XRow> xRow(xSet,UNO_QUERY_THROW); while(xSet->next()) @@ -608,8 +608,8 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo if(aFind != _pInfoMap->end()) { (*aIter)->second->SetType(aFind->second); - (*aIter)->second->SetPrecision(::std::min<sal_Int32>(aFind->second->nPrecision,nLength)); - (*aIter)->second->SetScale(::std::min<sal_Int32>(aFind->second->nMaximumScale,nScale)); + (*aIter)->second->SetPrecision(std::min<sal_Int32>(aFind->second->nPrecision,nLength)); + (*aIter)->second->SetScale(std::min<sal_Int32>(aFind->second->nMaximumScale,nScale)); sal_Int32 nFormatKey = ::dbtools::getDefaultNumberFormat( nDataType, (*aIter)->second->GetScale(), @@ -632,7 +632,7 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName) aAlias = ::dbtools::convertName2SQLName(_rColumnName,xDestMetaData->getExtraNameCharacters()); if(nMaxNameLen && aAlias.getLength() > nMaxNameLen) - aAlias = aAlias.copy(0, ::std::min<sal_Int32>( nMaxNameLen-1, aAlias.getLength() ) ); + aAlias = aAlias.copy(0, std::min<sal_Int32>( nMaxNameLen-1, aAlias.getLength() ) ); OUString sName(aAlias); if(m_aDestColumns.find(sName) != m_aDestColumns.end()) @@ -645,7 +645,7 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName) + OUString::number(++nPos); if(nMaxNameLen && sName.getLength() > nMaxNameLen) { - aAlias = aAlias.copy(0,::std::min<sal_Int32>( nMaxNameLen-nCount, aAlias.getLength() )); + aAlias = aAlias.copy(0,std::min<sal_Int32>( nMaxNameLen-nCount, aAlias.getLength() )); sName = aAlias + OUString::number(nPos); ++nCount; @@ -657,7 +657,7 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName) OFieldDescription* pField = new OFieldDescription(); pField->SetType(m_pTypeInfo); pField->SetName(aAlias); - pField->SetPrecision(::std::min<sal_Int32>((sal_Int32)255,m_pTypeInfo->nPrecision)); + pField->SetPrecision(std::min<sal_Int32>((sal_Int32)255,m_pTypeInfo->nPrecision)); pField->SetScale(0); pField->SetIsNullable(ColumnValue::NULLABLE); pField->SetAutoIncrement(false); @@ -776,7 +776,7 @@ void ODatabaseExport::adjustFormat() OSL_ENSURE((nColPos) < static_cast<sal_Int32>(m_vNumberFormat.size()),"m_vFormatKey: Illegal index for vector"); OSL_ENSURE((nColPos) < static_cast<sal_Int32>(m_vColumnSize.size()),"m_vColumnSize: Illegal index for vector"); m_vNumberFormat[nColPos] = CheckString(m_sTextToken,m_vNumberFormat[nColPos]); - m_vColumnSize[nColPos] = ::std::max<sal_Int32>((sal_Int32)m_vColumnSize[nColPos], m_sTextToken.getLength()); + m_vColumnSize[nColPos] = std::max<sal_Int32>((sal_Int32)m_vColumnSize[nColPos], m_sTextToken.getLength()); } } eraseTokens(); @@ -829,11 +829,11 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R return Reference< XPreparedStatement > (); } const OUString* pIter = aDestColumnNames.getConstArray(); - ::std::vector< OUString> aInsertList; + std::vector< OUString> aInsertList; aInsertList.resize(aDestColumnNames.getLength()+1); for(size_t j=0; j < aInsertList.size(); ++j) { - ODatabaseExport::TPositions::const_iterator aFind = ::std::find_if(_rvColumns.begin(),_rvColumns.end(), + ODatabaseExport::TPositions::const_iterator aFind = std::find_if(_rvColumns.begin(),_rvColumns.end(), [j] (const ODatabaseExport::TPositions::value_type& tPos) { return tPos.second == (sal_Int32)(j+1); }); if ( _rvColumns.end() != aFind && aFind->second != sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND) && aFind->first != sal::static_int_cast< long >(CONTAINER_ENTRY_NOTFOUND) ) @@ -844,8 +844,8 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R } // create the sql string - ::std::vector< OUString>::const_iterator aInsertEnd = aInsertList.end(); - for (::std::vector< OUString>::const_iterator aInsertIter = aInsertList.begin(); aInsertIter != aInsertEnd; ++aInsertIter) + std::vector< OUString>::const_iterator aInsertEnd = aInsertList.end(); + for (std::vector< OUString>::const_iterator aInsertIter = aInsertList.begin(); aInsertIter != aInsertEnd; ++aInsertIter) { if ( !aInsertIter->isEmpty() ) { diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index e006693b208a..944b8b6d631c 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -100,8 +100,8 @@ bool ORowSetImportExport::Write() bool ORowSetImportExport::Read() { // check if there is any column to copy - if(::std::find_if(m_aColumnMapping.begin(),m_aColumnMapping.end(), - ::std::bind2nd(::std::greater<sal_Int32>(),0)) == m_aColumnMapping.end()) + if(std::find_if(m_aColumnMapping.begin(),m_aColumnMapping.end(), + std::bind2nd(std::greater<sal_Int32>(),0)) == m_aColumnMapping.end()) return false; bool bContinue = true; if(m_aSelection.getLength()) @@ -157,8 +157,8 @@ bool ORowSetImportExport::insertNewRow() { m_xTargetResultSetUpdate->moveToInsertRow(); sal_Int32 i = 1; - ::std::vector<sal_Int32>::const_iterator aEnd = m_aColumnMapping.end(); - for (::std::vector<sal_Int32>::const_iterator aIter = m_aColumnMapping.begin(); aIter != aEnd ;++aIter,++i ) + std::vector<sal_Int32>::const_iterator aEnd = m_aColumnMapping.end(); + for (std::vector<sal_Int32>::const_iterator aIter = m_aColumnMapping.begin(); aIter != aEnd ;++aIter,++i ) { if(*aIter > 0) { diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 987a4ea4d0fc..e0df88e01f13 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -297,7 +297,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, TOTypeInfoSP pTypeInfo; _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 { @@ -427,7 +427,7 @@ TOTypeInfoSP getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo, void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection, const OUString& _rsTypeNames, OTypeInfoMap& _rTypeInfoMap, - ::std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters) + std::vector<OTypeInfoMap::iterator>& _rTypeInfoIters) { if(!_rxConnection.is()) return; @@ -438,8 +438,8 @@ void fillTypeInfo( const Reference< css::sdbc::XConnection>& _rxConnection, { Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData(); ::connectivity::ORowSetValue aValue; - ::std::vector<sal_Int32> aTypes; - ::std::vector<sal_Bool> aNullable; + std::vector<sal_Int32> aTypes; + std::vector<sal_Bool> aNullable; // Loop on the result set until we reach end of file while (xRs->next()) { @@ -1038,14 +1038,14 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource, _xDatasource->getPropertyValue(PROPERTY_INFO) >>= aInfo; // search the right propertyvalue - const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(), + const PropertyValue* pValue =std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), - ::std::bind2nd(TPropertyValueEqualFunctor(),PROPERTY_AUTOINCREMENTCREATION)); + std::bind2nd(TPropertyValueEqualFunctor(),PROPERTY_AUTOINCREMENTCREATION)); if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) ) pValue->Value >>= _rsAutoIncrementValue; - pValue =::std::find_if(aInfo.getConstArray(), + pValue =std::find_if(aInfo.getConstArray(), aInfo.getConstArray() + aInfo.getLength(), - ::std::bind2nd(TPropertyValueEqualFunctor(),OUString("IsAutoRetrievingEnabled") )); + std::bind2nd(TPropertyValueEqualFunctor(),OUString("IsAutoRetrievingEnabled") )); if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) ) pValue->Value >>= _rAutoIncrementValueEnabled; } diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index a83eb94c9bc7..460bebf4fa4b 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -220,7 +220,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton, void ) sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::UStringMixEqual aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< OUString> aRightColumns; + std::vector< OUString> aRightColumns; fillColumns(pRight,aRightColumns); if(!bAll) @@ -266,7 +266,7 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox&, rListBox, void ) sal_Int32 nMaxNameLen = m_pParent->getMaxColumnNameLength(); ::comphelper::UStringMixEqual aCase(xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< OUString> aRightColumns; + std::vector< OUString> aRightColumns; fillColumns(pRight,aRightColumns); for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i) @@ -284,7 +284,7 @@ void OWizColumnSelect::clearListBox(ListBox& _rListBox) _rListBox.Clear(); } -void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< OUString> &_rRightColumns) +void OWizColumnSelect::fillColumns(ListBox* pRight,std::vector< OUString> &_rRightColumns) { const sal_Int32 nCount = pRight->GetEntryCount(); _rRightColumns.reserve(nCount); @@ -294,7 +294,7 @@ void OWizColumnSelect::fillColumns(ListBox* pRight,::std::vector< OUString> &_rR void OWizColumnSelect::createNewColumn( ListBox* _pListbox, OFieldDescription* _pSrcField, - ::std::vector< OUString>& _rRightColumns, + std::vector< OUString>& _rRightColumns, const OUString& _sColumnName, const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, @@ -320,7 +320,7 @@ void OWizColumnSelect::createNewColumn( ListBox* _pListbox, void OWizColumnSelect::moveColumn( ListBox* _pRight, ListBox* _pLeft, - ::std::vector< OUString>& _rRightColumns, + std::vector< OUString>& _rRightColumns, const OUString& _sColumnName, const OUString& _sExtraChars, sal_Int32 _nMaxNameLen, @@ -335,7 +335,7 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, else { // find the new column in the dest name mapping to obtain the old column - OCopyTableWizard::TNameMapping::const_iterator aIter = ::std::find_if(m_pParent->m_mNameMapping.begin(),m_pParent->m_mNameMapping.end(), + OCopyTableWizard::TNameMapping::const_iterator aIter = std::find_if(m_pParent->m_mNameMapping.begin(),m_pParent->m_mNameMapping.end(), [&_aCase, &_sColumnName] (const OCopyTableWizard::TNameMapping::value_type& nameMap) { return _aCase(nameMap.second, _sColumnName); }); @@ -349,7 +349,7 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, { // we need also the old position of this column to insert it back on that position again const ODatabaseExport::TColumnVector& rSrcVector = m_pParent->getSrcVector(); - ODatabaseExport::TColumnVector::const_iterator aPos = ::std::find(rSrcVector.begin(), rSrcVector.end(), aSrcIter); + ODatabaseExport::TColumnVector::const_iterator aPos = std::find(rSrcVector.begin(), rSrcVector.end(), aSrcIter); OSL_ENSURE( aPos != rSrcVector.end(),"Invalid position for the iterator here!"); ODatabaseExport::TColumnVector::size_type nPos = (aPos - rSrcVector.begin()) - adjustColumnPosition(_pLeft, _sColumnName, (aPos - rSrcVector.begin()), _aCase); @@ -384,7 +384,7 @@ sal_Int32 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, if(_sColumnName != sColumnString) { // find the new column in the dest name mapping to obtain the old column - OCopyTableWizard::TNameMapping::const_iterator aIter = ::std::find_if(m_pParent->m_mNameMapping.begin(),m_pParent->m_mNameMapping.end(), + OCopyTableWizard::TNameMapping::const_iterator aIter = std::find_if(m_pParent->m_mNameMapping.begin(),m_pParent->m_mNameMapping.end(), [&_aCase, &sColumnString] (const OCopyTableWizard::TNameMapping::value_type& nameMap) { return _aCase(nameMap.second, sColumnString); }); @@ -396,7 +396,7 @@ sal_Int32 OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, { // we need also the old position of this column to insert it back on that position again const ODatabaseExport::TColumnVector& rSrcVector = m_pParent->getSrcVector(); - ODatabaseExport::TColumnVector::const_iterator aPos = ::std::find(rSrcVector.begin(), rSrcVector.end(), aSrcIter); + ODatabaseExport::TColumnVector::const_iterator aPos = std::find(rSrcVector.begin(), rSrcVector.end(), aSrcIter); ODatabaseExport::TColumnVector::size_type nPos = aPos - rSrcVector.begin(); if( nPos < nCurrentPos) { diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index e259e29b369c..1457bea1227c 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -152,9 +152,9 @@ void ObjectCopySource::copyUISettingsTo( const Reference< XPropertySet >& _rxObj void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _xConnection,const Reference< XPropertySet >& _rxObject ) const { - ::std::pair< OUString, OUString > aProperties[] = { - ::std::pair< OUString, OUString >(PROPERTY_FILTER,OUString(" AND ")) - ,::std::pair< OUString, OUString >(PROPERTY_ORDER,OUString(" ORDER BY ")) + std::pair< OUString, OUString > aProperties[] = { + std::pair< OUString, OUString >(PROPERTY_FILTER,OUString(" AND ")) + ,std::pair< OUString, OUString >(PROPERTY_ORDER,OUString(" ORDER BY ")) }; try @@ -340,7 +340,7 @@ void NamedTableCopySource::impl_ensureColumnInfo_throw() Sequence< OUString > NamedTableCopySource::getColumnNames() const { Sequence< OUString > aNames( m_aColumnInfo.size() ); - for ( ::std::vector< OFieldDescription >::const_iterator col = m_aColumnInfo.begin(); + for ( std::vector< OFieldDescription >::const_iterator col = m_aColumnInfo.begin(); col != m_aColumnInfo.end(); ++col ) @@ -374,7 +374,7 @@ Sequence< OUString > NamedTableCopySource::getPrimaryKeyColumnNames() const OFieldDescription* NamedTableCopySource::createFieldDescription( const OUString& _rColumnName ) const { - for ( ::std::vector< OFieldDescription >::const_iterator col = m_aColumnInfo.begin(); + for ( std::vector< OFieldDescription >::const_iterator col = m_aColumnInfo.begin(); col != m_aColumnInfo.end(); ++col ) @@ -795,7 +795,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) if ( aDestIter != m_vDestColumns.end() ) { - ODatabaseExport::TColumnVector::const_iterator aFind = ::std::find(m_aDestVec.begin(),m_aDestVec.end(),aDestIter); + ODatabaseExport::TColumnVector::const_iterator aFind = std::find(m_aDestVec.begin(),m_aDestVec.end(),aDestIter); sal_Int32 nPos = (aFind - m_aDestVec.begin())+1; m_vColumnPos.push_back(ODatabaseExport::TPositions::value_type(nPos,nPos)); m_vColumnTypes.push_back((*aFind)->second->GetType()); @@ -873,7 +873,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl, Button*, void) { if ( supportsPrimaryKey() ) { - ODatabaseExport::TColumns::const_iterator aFind = ::std::find_if(m_vDestColumns.begin(),m_vDestColumns.end(), + ODatabaseExport::TColumns::const_iterator aFind = std::find_if(m_vDestColumns.begin(),m_vDestColumns.end(), [] (const ODatabaseExport::TColumns::value_type& tCol) { return tCol.second->IsPrimaryKey(); }); if ( aFind == m_vDestColumns.end() && m_xInteractionHandler.is() ) { @@ -1270,10 +1270,10 @@ Reference< XPropertySet > OCopyTableWizard::createTable() if ( aDestIter != m_vDestColumns.end() ) { - ODatabaseExport::TColumnVector::const_iterator aFind = ::std::find(m_aDestVec.begin(),m_aDestVec.end(),aDestIter); + ODatabaseExport::TColumnVector::const_iterator aFind = std::find(m_aDestVec.begin(),m_aDestVec.end(),aDestIter); sal_Int32 nPos = (aFind - m_aDestVec.begin())+1; - ODatabaseExport::TPositions::iterator aPosFind = ::std::find_if( + ODatabaseExport::TPositions::iterator aPosFind = std::find_if( m_vColumnPos.begin(), m_vColumnPos.end(), [nPos] (const ODatabaseExport::TPositions::value_type& tPos) { diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index ee457f1b945e..410d6a01942b 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -154,7 +154,7 @@ bool OWizNameMatching::LeavePage() ODatabaseExport::TColumnVector::const_iterator aSrcEnd = rSrcColumns.end(); for(;aSrcIter != aSrcEnd && (*aSrcIter)->second != pSrcField;++aSrcIter) ; - const sal_Int32 nPos = ::std::distance(rSrcColumns.begin(),aSrcIter); + const sal_Int32 nPos = std::distance(rSrcColumns.begin(),aSrcIter); if(m_pCTRL_LEFT->GetCheckButtonState(pLeftEntry) == SvButtonState::Checked) { @@ -169,7 +169,7 @@ bool OWizNameMatching::LeavePage() OSL_ENSURE((nPos) < static_cast<sal_Int32>(m_pParent->m_vColumnPos.size()),"m_pParent->m_vColumnPos: Illegal index for vector"); m_pParent->m_vColumnPos[nPos].first = ++nParamPos; - m_pParent->m_vColumnPos[nPos].second = ::std::distance(rDestColumns.begin(),aDestIter) + 1; + m_pParent->m_vColumnPos[nPos].second = std::distance(rDestColumns.begin(),aDestIter) + 1; TOTypeInfoSP pTypeInfo; diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 9b4ea9eaf3f9..82a5d90e8e7f 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -227,11 +227,11 @@ namespace dbaui if ( !m_pImpl->documentHasScriptSupport() ) { Sequence< Type > aStrippedTypes( aTypes.getLength() - 1 ); - ::std::remove_copy_if( + std::remove_copy_if( aTypes.getConstArray(), aTypes.getConstArray() + aTypes.getLength(), aStrippedTypes.getArray(), - ::std::bind2nd( ::std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() ) + std::bind2nd( std::equal_to< Type >(), cppu::UnoType<XScriptInvocationContext>::get() ) ); aTypes = aStrippedTypes; } diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index 89c0d556a013..4e8da229b874 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -86,7 +86,7 @@ namespace dbaui static const FeatureSet& lcl_getFeatureSet( const OUString& _rURL ) { - typedef ::std::map< OUString, FeatureSet > FeatureSets; + typedef std::map< OUString, FeatureSet > FeatureSets; static FeatureSets s_aFeatureSets; if ( s_aFeatureSets.empty() ) { diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 1ddeaf5dbcc0..a14d86e50c7d 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -315,8 +315,8 @@ bool OConnectionLine::CheckHit( const Point& rMousePos ) const double l = fabs(dist_Euklid(m_aSourceConnPos,m_aDestConnPos,rMousePos,q)); if( l < HIT_SENSITIVE_RADIUS) { - if(::std::min(m_aSourceConnPos.X(),m_aDestConnPos.X()) <= q.X() && ::std::min(m_aSourceConnPos.Y(),m_aDestConnPos.Y()) <= q.Y() - && q.X() <= ::std::max(m_aDestConnPos.X(),m_aSourceConnPos.X()) && q.Y() <= ::std::max(m_aDestConnPos.Y(),m_aSourceConnPos.Y())) + if(std::min(m_aSourceConnPos.X(),m_aDestConnPos.X()) <= q.X() && std::min(m_aSourceConnPos.Y(),m_aDestConnPos.Y()) <= q.Y() + && q.X() <= std::max(m_aDestConnPos.X(),m_aSourceConnPos.X()) && q.Y() <= std::max(m_aDestConnPos.Y(),m_aSourceConnPos.Y())) return true; } diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index b2243bc4e505..84044841c6ed 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -301,7 +301,7 @@ void OJoinController::SaveTabWinsPosSize( OJoinTableView::OTableWindowMap* pTabW void OJoinController::removeConnectionData(const TTableConnectionData::value_type& _pData) { - m_vTableConnectionData.erase( ::std::remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end()); + m_vTableConnectionData.erase( std::remove(m_vTableConnectionData.begin(),m_vTableConnectionData.end(),_pData),m_vTableConnectionData.end()); } void OJoinController::describeSupportedFeatures() diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 88fe2941e6cd..6f383c341841 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -380,7 +380,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) pTabWin->Hide(); OJoinController& rController = m_pView->getController(); - TTableWindowData::iterator aFind = ::std::find(rController.getTableWindowData().begin(), rController.getTableWindowData().end(), pData); + TTableWindowData::iterator aFind = std::find(rController.getTableWindowData().begin(), rController.getTableWindowData().end(), pData); if(aFind != rController.getTableWindowData().end()) { rController.getTableWindowData().erase(aFind); @@ -902,8 +902,8 @@ void OJoinTableView::SelectConn(OTableConnection* pConn) SvTreeListEntry* pFirstSourceVisible = pSourceBox->GetFirstEntryInView(); SvTreeListEntry* pFirstDestVisible = pDestBox->GetFirstEntryInView(); - const ::std::vector<OConnectionLine*>& rLines = pConn->GetConnLineList(); - ::std::vector<OConnectionLine*>::const_reverse_iterator aIter = rLines.rbegin(); + const std::vector<OConnectionLine*>& rLines = pConn->GetConnLineList(); + std::vector<OConnectionLine*>::const_reverse_iterator aIter = rLines.rbegin(); for(;aIter != rLines.rend();++aIter) { if ((*aIter)->IsValid()) @@ -955,18 +955,18 @@ void OJoinTableView::DrawConnections(vcl::RenderContext& rRenderContext, const R GetSelectedConn()->Draw(rRenderContext, rRect); } -::std::vector<VclPtr<OTableConnection> >::const_iterator OJoinTableView::getTableConnections(const OTableWindow* _pFromWin) const +std::vector<VclPtr<OTableConnection> >::const_iterator OJoinTableView::getTableConnections(const OTableWindow* _pFromWin) const { - return ::std::find_if( m_vTableConnection.begin(), + return std::find_if( m_vTableConnection.begin(), m_vTableConnection.end(), - ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); + std::bind2nd(std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); } sal_Int32 OJoinTableView::getConnectionCount(const OTableWindow* _pFromWin) const { - return ::std::count_if( m_vTableConnection.begin(), + return std::count_if( m_vTableConnection.begin(), m_vTableConnection.end(), - ::std::bind2nd(::std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); + std::bind2nd(std::mem_fun(&OTableConnection::isTableConnection),_pFromWin)); } bool OJoinTableView::ExistsAConn(const OTableWindow* pFrom) const @@ -1159,8 +1159,8 @@ void OJoinTableView::Command(const CommandEvent& rEvt) { if (rSelConnection) { - const ::std::vector<OConnectionLine*>& rLines = rSelConnection->GetConnLineList(); - ::std::vector<OConnectionLine*>::const_iterator aIter = ::std::find_if(rLines.begin(), rLines.end(),::std::mem_fun(&OConnectionLine::IsValid)); + const std::vector<OConnectionLine*>& rLines = rSelConnection->GetConnLineList(); + std::vector<OConnectionLine*>::const_iterator aIter = std::find_if(rLines.begin(), rLines.end(),std::mem_fun(&OConnectionLine::IsValid)); if( aIter != rLines.end() ) executePopup((*aIter)->getMidPoint(), rSelConnection); } @@ -1561,7 +1561,7 @@ void OJoinTableView::addConnection(OTableConnection* _pConnection,bool _bAddData { #if OSL_DEBUG_LEVEL > 0 TTableConnectionData& rTabConnDataList = m_pView->getController().getTableConnectionData(); - OSL_ENSURE( ::std::find(rTabConnDataList.begin(), rTabConnDataList.end(),_pConnection->GetData()) == rTabConnDataList.end(),"Data already in vector!"); + OSL_ENSURE( std::find(rTabConnDataList.begin(), rTabConnDataList.end(),_pConnection->GetData()) == rTabConnDataList.end(),"Data already in vector!"); #endif m_pView->getController().getTableConnectionData().push_back(_pConnection->GetData()); } diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index ab12b20f4e34..8463687025c3 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -719,7 +719,7 @@ namespace OTableFields::const_iterator aEnd = _rFieldList.end(); for(;aIter != aEnd;++aIter) { - nMaxCriteria = ::std::max<sal_uInt16>(nMaxCriteria,(sal_uInt16)(*aIter)->GetCriteria().size()); + nMaxCriteria = std::max<sal_uInt16>(nMaxCriteria,(sal_uInt16)(*aIter)->GetCriteria().size()); } try { @@ -964,7 +964,7 @@ namespace void GenerateInnerJoinCriterias(const Reference< XConnection>& _xConnection, OUString& _rJoinCrit, - const ::std::vector<VclPtr<OTableConnection> >& _rConnList) + const std::vector<VclPtr<OTableConnection> >& _rConnList) { auto aIter = _rConnList.begin(); auto aEnd = _rConnList.end(); @@ -995,7 +995,7 @@ namespace } OUString GenerateFromClause( const Reference< XConnection>& _xConnection, const OQueryTableView::OTableWindowMap* pTabList, - const ::std::vector<VclPtr<OTableConnection> >& rConnList + const std::vector<VclPtr<OTableConnection> >& rConnList ) { @@ -1008,24 +1008,24 @@ namespace { auto aIter = rConnList.begin(); auto aEnd = rConnList.end(); - ::std::map<OTableWindow*,sal_Int32> aConnectionCount; + std::map<OTableWindow*,sal_Int32> aConnectionCount; for(;aIter != aEnd;++aIter) { static_cast<OQueryTableConnection*>((*aIter).get())->SetVisited(false); ++aConnectionCount[(*aIter)->GetSourceWin()]; ++aConnectionCount[(*aIter)->GetDestWin()]; } - ::std::multimap<sal_Int32 , OTableWindow*> aMulti; - ::std::map<OTableWindow*,sal_Int32>::const_iterator aCountIter = aConnectionCount.begin(); - ::std::map<OTableWindow*,sal_Int32>::const_iterator aCountEnd = aConnectionCount.end(); + std::multimap<sal_Int32 , OTableWindow*> aMulti; + std::map<OTableWindow*,sal_Int32>::const_iterator aCountIter = aConnectionCount.begin(); + std::map<OTableWindow*,sal_Int32>::const_iterator aCountEnd = aConnectionCount.end(); for(;aCountIter != aCountEnd;++aCountIter) { - aMulti.insert(::std::multimap<sal_Int32 , OTableWindow*>::value_type(aCountIter->second,aCountIter->first)); + aMulti.insert(std::multimap<sal_Int32 , OTableWindow*>::value_type(aCountIter->second,aCountIter->first)); } const bool bUseEscape = ::dbtools::getBooleanDataSourceSetting( _xConnection, PROPERTY_OUTERJOINESCAPE ); - ::std::multimap<sal_Int32 , OTableWindow*>::const_reverse_iterator aRIter = aMulti.rbegin(); - ::std::multimap<sal_Int32 , OTableWindow*>::const_reverse_iterator aREnd = aMulti.rend(); + std::multimap<sal_Int32 , OTableWindow*>::const_reverse_iterator aRIter = aMulti.rbegin(); + std::multimap<sal_Int32 , OTableWindow*>::const_reverse_iterator aREnd = aMulti.rend(); for(;aRIter != aREnd;++aRIter) { auto aConIter = aRIter->second->getTableView()->getTableConnections(aRIter->second); @@ -1115,7 +1115,7 @@ namespace if(!xConnection.is()) return OUString(); - ::std::map< OUString,bool> aGroupByNames; + std::map< OUString,bool> aGroupByNames; OUString aGroupByStr; try @@ -1159,7 +1159,7 @@ namespace } if ( aGroupByNames.find(sGroupByPart) == aGroupByNames.end() ) { - aGroupByNames.insert(::std::map< OUString,bool>::value_type(sGroupByPart,true)); + aGroupByNames.insert(std::map< OUString,bool>::value_type(sGroupByPart,true)); aGroupByStr += sGroupByPart + ","; } } @@ -2701,7 +2701,7 @@ void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFi OJoinTableView::OTableWindowMap& rTabWins = m_pTableView->GetTabWinMap(); OUString strCurrentPrefix; - ::std::vector< OUString> aFields; + std::vector< OUString> aFields; OJoinTableView::OTableWindowMap::const_iterator aIter = rTabWins.begin(); OJoinTableView::OTableWindowMap::const_iterator aEnd = rTabWins.end(); for(;aIter != aEnd;++aIter) @@ -2713,8 +2713,8 @@ void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFi pCurrentWin->EnumValidFields(aFields); - ::std::vector< OUString>::const_iterator aStrIter = aFields.begin(); - ::std::vector< OUString>::const_iterator aStrEnd = aFields.end(); + std::vector< OUString>::const_iterator aStrIter = aFields.begin(); + std::vector< OUString>::const_iterator aStrEnd = aFields.end(); for(;aStrIter != aStrEnd;++aStrIter) { if (bAllTables || aStrIter->toChar() == '*') diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index 30257e9a9f6f..e0bfd9658a19 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -33,7 +33,7 @@ namespace dbaui class OQueryTabWinUndoAct : public OQueryDesignUndoAction { protected: - ::std::vector<VclPtr<OTableConnection> > m_vTableConnection; + std::vector<VclPtr<OTableConnection> > m_vTableConnection; VclPtr<OQueryTableWindow> m_pTabWin; bool m_bOwnerOfObjects; // am I the only owner of the managed objects? (changes with every redo or undo) @@ -51,7 +51,7 @@ namespace dbaui void SetTabWin(OQueryTableWindow* pTW) { m_pTabWin = pTW; } // now SetOwnership should be invoked - ::std::vector<VclPtr<OTableConnection> >& GetTabConnList() { return m_vTableConnection; } + std::vector<VclPtr<OTableConnection> >& GetTabConnList() { return m_vTableConnection; } void InsertConnection( OTableConnection* pConnection ) { m_vTableConnection.push_back(pConnection); } }; diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index c6fa90fc8e6d..a5097e0b6e0b 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -251,7 +251,7 @@ void OQueryTableView::ReSync() "before calling OQueryTableView::ReSync() please call ClearAll !"); // I need a collection of all window names that cannot be created so that I do not initialize connections for them. - ::std::vector<OUString> arrInvalidTables; + std::vector<OUString> arrInvalidTables; TTableWindowData::const_reverse_iterator aIter = rTabWinDataList.rbegin(); // Create the window and add it @@ -272,7 +272,7 @@ void OQueryTableView::ReSync() pTabWin.disposeAndClear(); arrInvalidTables.push_back(pData->GetAliasName()); - rTabWinDataList.erase( ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end()); + rTabWinDataList.erase( std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end()); continue; } @@ -294,14 +294,14 @@ void OQueryTableView::ReSync() // do both tables for the connection exist ? OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetWinName(); - bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bool bInvalid = std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); strTabExistenceTest = pTabConnData->getReferencedTable()->GetWinName(); - bInvalid = bInvalid && ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bInvalid = bInvalid && std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) { // no -> bad luck, no connection - rTabConnDataList.erase( ::std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end()); + rTabConnDataList.erase( std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end()); continue; } @@ -329,7 +329,7 @@ void OQueryTableView::NotifyTabConnection(const OQueryTableConnection& rNewConn, OQueryTableConnection* pTabConn = nullptr; const auto& rConnections = getTableConnections(); auto aEnd = rConnections.end(); - auto aIter = ::std::find( rConnections.begin(), + auto aIter = std::find( rConnections.begin(), aEnd, VclPtr<OTableConnection>(const_cast<OTableConnection*>(static_cast<const OTableConnection*>(&rNewConn))) ); @@ -809,7 +809,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc // the TabWin data must also be passed out of my responsibility TTableWindowData& rTabWinDataList = m_pView->getController().getTableWindowData(); - rTabWinDataList.erase( ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), pTabWin->GetData()), rTabWinDataList.end()); + rTabWinDataList.erase( std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), pTabWin->GetData()), rTabWinDataList.end()); // The data should not be destroyed as TabWin itself - which is still alive - needs them // Either it goes back into my responsibility, (via ShowTabWin), then I add the data back, // or the Undo-Action, which currently has full responsibility for the window diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index b9fb54822c11..9994c52ed909 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -930,7 +930,7 @@ bool OSelectionBrowseBox::SaveModified() { OTableFieldDescRef pNewEntry = new OTableFieldDesc(); pNewEntry->SetColumnId( pEntry->GetColumnId() ); - ::std::replace(getFields().begin(),getFields().end(),pEntry,pNewEntry); + std::replace(getFields().begin(),getFields().end(),pEntry,pNewEntry); sal_uInt16 nCol = GetCurColumnId(); for (int i = 0; i < m_nVisibleCount; i++) // redraw column RowModified(i,nCol); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 4fad23f3af48..9366ecfbbb44 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -51,7 +51,7 @@ namespace dbaui class OSelectionBrowseBox : public ::svt::EditBrowseBox { friend class OQueryDesignView; - ::std::vector<bool> m_bVisibleRow; // at pos we find the RowId + std::vector<bool> m_bVisibleRow; // at pos we find the RowId Timer m_timerInvalidate; long m_nSeekRow; diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 2f4d014a96c2..606e9f10ba9b 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -64,8 +64,8 @@ namespace dbaui void OTableConnection::clearLineData() { - ::std::vector<OConnectionLine*>::const_iterator aLineEnd = m_vConnLine.end(); - for(::std::vector<OConnectionLine*>::const_iterator aLineIter = m_vConnLine.begin();aLineIter != aLineEnd;++aLineIter) + std::vector<OConnectionLine*>::const_iterator aLineEnd = m_vConnLine.end(); + for(std::vector<OConnectionLine*>::const_iterator aLineIter = m_vConnLine.begin();aLineIter != aLineEnd;++aLineIter) delete *aLineIter; m_vConnLine.clear(); } @@ -88,9 +88,9 @@ namespace dbaui // copy linelist if(! rConn.GetConnLineList().empty() ) { - const ::std::vector<OConnectionLine*>& rLine = rConn.GetConnLineList(); - ::std::vector<OConnectionLine*>::const_iterator aIter = rLine.begin(); - ::std::vector<OConnectionLine*>::const_iterator aEnd = rLine.end(); + const std::vector<OConnectionLine*>& rLine = rConn.GetConnLineList(); + std::vector<OConnectionLine*>::const_iterator aIter = rLine.begin(); + std::vector<OConnectionLine*>::const_iterator aEnd = rLine.end(); m_vConnLine.reserve(rLine.size()); for(;aIter != aEnd;++aIter) m_vConnLine.push_back( new OConnectionLine( **aIter )); @@ -148,7 +148,7 @@ namespace dbaui bool OTableConnection::CheckHit( const Point& rMousePos ) const { // check if the point hit our line - return ::std::any_of(m_vConnLine.begin(), + return std::any_of(m_vConnLine.begin(), m_vConnLine.end(), [&rMousePos] ( const OConnectionLine* pLine ) @@ -172,8 +172,8 @@ namespace dbaui // determine all lines of the surrounding rectangle Rectangle aBoundingRect( Point(0,0), Point(0,0) ); Rectangle aTempRect; - ::std::vector<OConnectionLine*>::const_iterator aEnd = m_vConnLine.end(); - for(::std::vector<OConnectionLine*>::const_iterator aIter = m_vConnLine.begin();aIter != aEnd;++aIter) + std::vector<OConnectionLine*>::const_iterator aEnd = m_vConnLine.end(); + for(std::vector<OConnectionLine*>::const_iterator aIter = m_vConnLine.begin();aIter != aEnd;++aIter) { aTempRect = (*aIter)->GetBoundingRect(); diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index c9d755d8b26f..21e7348d9d2f 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -121,7 +121,7 @@ OUString OTableFieldDesc::GetCriteria( sal_uInt16 nIdx ) const namespace { - struct SelectPropertyValueAsString : public ::std::unary_function< PropertyValue, OUString > + struct SelectPropertyValueAsString : public std::unary_function< PropertyValue, OUString > { OUString operator()( const PropertyValue& i_rPropValue ) const { @@ -154,7 +154,7 @@ void OTableFieldDesc::Load( const css::beans::PropertyValue& i_rSettings, const { const Sequence< PropertyValue > aCriteria( aFieldDesc.getOrDefault( "Criteria", Sequence< PropertyValue >() ) ); m_aCriteria.resize( aCriteria.getLength() ); - ::std::transform( + std::transform( aCriteria.getConstArray(), aCriteria.getConstArray() + aCriteria.getLength(), m_aCriteria.begin(), @@ -185,7 +185,7 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con { sal_Int32 c = 0; Sequence< PropertyValue > aCriteria( m_aCriteria.size() ); - for ( ::std::vector< OUString >::const_iterator crit = m_aCriteria.begin(); + for ( std::vector< OUString >::const_iterator crit = m_aCriteria.begin(); crit != m_aCriteria.end(); ++crit, ++c ) diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index c2ae87db31b6..dfc78424b2a7 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -519,7 +519,7 @@ bool OTableWindow::ExistsAConn() const return getTableView()->ExistsAConn(this); } -void OTableWindow::EnumValidFields(::std::vector< OUString>& arrstrFields) +void OTableWindow::EnumValidFields(std::vector< OUString>& arrstrFields) { arrstrFields.clear(); // This default implementation counts every item in the ListBox ... for any other behaviour it must be over-written diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index e3b132b1f689..0a0c98cc3357 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -213,7 +213,7 @@ namespace dbaui auto aIter = pView->getTableConnections(m_pTable); auto aEnd = rConnectionList.end(); - ::std::vector< Reference<XInterface> > aRelations; + std::vector< Reference<XInterface> > aRelations; aRelations.reserve(5); // just guessing for (; aIter != aEnd ; ++aIter ) { diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 9351116c60c3..6d20196910bd 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -403,7 +403,7 @@ void SAL_CALL OQueryController::getFastPropertyValue( Any& o_rValue, sal_Int32 i PropertyAttribute::READONLY ); - ::std::sort( + std::sort( aProps.getArray(), aProps.getArray() + aProps.getLength(), ::comphelper::PropertyCompareByName() @@ -1568,9 +1568,9 @@ struct CommentStrip See also delComment() implementation for OSQLParser::parseTree(). */ -static ::std::vector< CommentStrip > getComment( const OUString& rQuery ) +static std::vector< CommentStrip > getComment( const OUString& rQuery ) { - ::std::vector< CommentStrip > aRet; + std::vector< CommentStrip > aRet; // First a quick search if there is any "--" or "//" or "/*", if not then // the whole copying loop is pointless. if (rQuery.indexOf( "--" ) < 0 && rQuery.indexOf( "//" ) < 0 && @@ -1645,7 +1645,7 @@ static ::std::vector< CommentStrip > getComment( const OUString& rQuery ) recomposition. This is ugly but at least allows commented queries while preserving the comments _somehow_. */ -static OUString concatComment( const OUString& rQuery, const ::std::vector< CommentStrip >& rComments ) +static OUString concatComment( const OUString& rQuery, const std::vector< CommentStrip >& rComments ) { // No comments => return query. if (rComments.empty()) @@ -1657,7 +1657,7 @@ static OUString concatComment( const OUString& rQuery, const ::std::vector< Comm // Obtaining the needed size once should be faster than reallocating. // Also add a blank or linefeed for each comment. sal_Int32 nBufSize = nLen + nComments; - for (::std::vector< CommentStrip >::const_iterator it( rComments.begin()); it != rComments.end(); ++it) + for (std::vector< CommentStrip >::const_iterator it( rComments.begin()); it != rComments.end(); ++it) nBufSize += (*it).maComment.getLength(); OUStringBuffer aBuf( nBufSize ); sal_Int32 nIndBeg = 0; @@ -1706,7 +1706,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange ) { OUString aErrorMsg; - ::std::vector< CommentStrip > aComments = getComment( m_sStatement); + std::vector< CommentStrip > aComments = getComment( m_sStatement); ::connectivity::OSQLParseNode* pNode = m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign ); if(pNode) @@ -1844,7 +1844,7 @@ void OQueryController::impl_reset( const bool i_bForceCurrentControllerSettings else if ( m_bEscapeProcessing ) { OUString aErrorMsg; - ::std::unique_ptr< ::connectivity::OSQLParseNode > pNode( + std::unique_ptr< ::connectivity::OSQLParseNode > pNode( m_aSqlParser.parseTree( aErrorMsg, m_sStatement, m_bGraphicalDesign ) ); if ( pNode.get() ) diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index 4b5824a0dbb0..6b0468508fda 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -61,7 +61,7 @@ void ORelationTableConnection::Draw(vcl::RenderContext& rRenderContext, const Re long nTemp; const OConnectionLine* pTopLine = nullptr; - const ::std::vector<OConnectionLine*>& rConnLineList = GetConnLineList(); + const std::vector<OConnectionLine*>& rConnLineList = GetConnLineList(); std::vector<OConnectionLine*>::const_iterator aIter = rConnLineList.begin(); std::vector<OConnectionLine*>::const_iterator aEnd = rConnLineList.end(); diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index e42dc0df526e..04f355764bb6 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -274,7 +274,7 @@ namespace { class RelationLoader : public ::osl::Thread { - typedef std::map<OUString, ::std::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper; + typedef std::map<OUString, std::shared_ptr<OTableWindowData>, ::comphelper::UStringMixLess> TTableDataHelper; TTableDataHelper m_aTableData; TTableConnectionData m_vTableConnectionData; const Sequence< OUString> m_aTableList; @@ -442,7 +442,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData { ::osl::MutexGuard aGuard( getMutex() ); - ::std::copy( _aConnectionData.begin(), _aConnectionData.end(), ::std::back_inserter( m_vTableConnectionData )); + std::copy( _aConnectionData.begin(), _aConnectionData.end(), std::back_inserter( m_vTableConnectionData )); // here we are finished, so we can collect the table from connection data TTableConnectionData::const_iterator aConnDataIter = m_vTableConnectionData.begin(); TTableConnectionData::const_iterator aConnDataEnd = m_vTableConnectionData.end(); @@ -501,7 +501,7 @@ void ORelationController::loadData() if ( aMeta.supportsThreads() ) { const sal_Int32 nMaxElements = (nCount / MAX_THREADS) +1; - sal_Int32 nStart = 0,nEnd = ::std::min(nMaxElements,nCount); + sal_Int32 nStart = 0,nEnd = std::min(nMaxElements,nCount); while(nStart != nEnd) { ++m_nThreadEvent; @@ -511,7 +511,7 @@ void ORelationController::loadData() pThread->resume(); nStart = nEnd; nEnd += nMaxElements; - nEnd = ::std::min(nEnd,nCount); + nEnd = std::min(nEnd,nCount); } } else diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index d0af2765bb64..705931b5cd0e 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -98,7 +98,7 @@ void ORelationTableView::ReSync() // Tables could have been hidden in the database, which are part of a relation. Or a table was in layout // (quite often without a relation) and does not exist anymore. In both cases creation of TabWins will fail // and all TabWinDatas and related ConnDates should be deleted. - ::std::vector< OUString> arrInvalidTables; + std::vector< OUString> arrInvalidTables; // create and insert windows TTableWindowData& rTabWinDataList = m_pView->getController().getTableWindowData(); @@ -116,7 +116,7 @@ void ORelationTableView::ReSync() pTabWin.disposeAndClear(); arrInvalidTables.push_back(pData->GetTableName()); - rTabWinDataList.erase( ::std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end()); + rTabWinDataList.erase( std::remove(rTabWinDataList.begin(), rTabWinDataList.end(), *aIter), rTabWinDataList.end()); continue; } @@ -139,14 +139,14 @@ void ORelationTableView::ReSync() { // do the tables to the connection exist? OUString strTabExistenceTest = pTabConnData->getReferencingTable()->GetTableName(); - bool bInvalid = ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bool bInvalid = std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); strTabExistenceTest = pTabConnData->getReferencedTable()->GetTableName(); - bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); + bInvalid = bInvalid || std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end(); if (bInvalid) { // no -> bad luck, the connection is gone - rTabConnDataList.erase( ::std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end() ); + rTabConnDataList.erase( std::remove(rTabConnDataList.begin(), rTabConnDataList.end(), *aConIter), rTabConnDataList.end() ); continue; } } diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 9476b33912a0..c96355c5dff2 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -189,13 +189,13 @@ void OFieldDescription::FillFromTypeInfo(const TOTypeInfoSP& _pType,bool _bForce sal_Int32 nPrec = DEFAULT_VARCHAR_PRECISION; if ( GetPrecision() ) nPrec = GetPrecision(); - SetPrecision(::std::min<sal_Int32>(nPrec,_pType->nPrecision)); + SetPrecision(std::min<sal_Int32>(nPrec,_pType->nPrecision)); } break; case DataType::TIMESTAMP: if ( bForce && _pType->nMaximumScale) { - SetScale(::std::min<sal_Int32>(GetScale() ? GetScale() : DEFAULT_NUMERIC_SCALE,_pType->nMaximumScale)); + SetScale(std::min<sal_Int32>(GetScale() ? GetScale() : DEFAULT_NUMERIC_SCALE,_pType->nMaximumScale)); } break; default: @@ -216,9 +216,9 @@ void OFieldDescription::FillFromTypeInfo(const TOTypeInfoSP& _pType,bool _bForce } if ( _pType->nPrecision ) - SetPrecision(::std::min<sal_Int32>(nPrec ? nPrec : DEFAULT_NUMERIC_PRECISION,_pType->nPrecision)); + SetPrecision(std::min<sal_Int32>(nPrec ? nPrec : DEFAULT_NUMERIC_PRECISION,_pType->nPrecision)); if ( _pType->nMaximumScale ) - SetScale(::std::min<sal_Int32>(GetScale() ? GetScale() : DEFAULT_NUMERIC_SCALE,_pType->nMaximumScale)); + SetScale(std::min<sal_Int32>(GetScale() ? GetScale() : DEFAULT_NUMERIC_SCALE,_pType->nMaximumScale)); } } if ( _pType->aCreateParams.isEmpty() ) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 9d4c26304a37..f089175f29ac 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -483,8 +483,8 @@ sal_Int32 OTableEditorCtrl::HasFieldName( const OUString& rFieldName ) ::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end(); sal_Int32 nCount(0); for(;aIter != aEnd;++aIter) { @@ -719,7 +719,7 @@ void OTableEditorCtrl::CopyRows() // Copy selected rows to the ClipboardList std::shared_ptr<OTableRow> pClipboardRow; std::shared_ptr<OTableRow> pRow; - ::std::vector< std::shared_ptr<OTableRow> > vClipboardList; + std::vector< std::shared_ptr<OTableRow> > vClipboardList; vClipboardList.reserve(GetSelectRowCount()); for( long nIndex=FirstSelectedRow(); nIndex >= 0 && nIndex < static_cast<long>(m_pRowList->size()); nIndex=NextSelectedRow() ) @@ -769,7 +769,7 @@ OUString OTableEditorCtrl::GenerateName( const OUString& rName ) void OTableEditorCtrl::InsertRows( long nRow ) { - ::std::vector< std::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling + std::vector< std::shared_ptr<OTableRow> > vInsertedUndoRedoRows; // need for undo/redo handling // get rows from clipboard TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent())); if(aTransferData.HasFormat(SotClipboardFormatId::SBA_TABED)) @@ -1449,7 +1449,7 @@ IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste, void*, void ) { // Insertion is not allowed, only appending, so test if there are full cells after the PastePosition sal_Int32 nFreeFromPos; // from here on there are only empty rows - ::std::vector< std::shared_ptr<OTableRow> >::const_reverse_iterator aIter = m_pRowList->rbegin(); + std::vector< std::shared_ptr<OTableRow> >::const_reverse_iterator aIter = m_pRowList->rbegin(); for(nFreeFromPos = m_pRowList->size(); aIter != m_pRowList->rend() && (!(*aIter) || !(*aIter)->GetActFieldDescr() || (*aIter)->GetActFieldDescr()->GetName().isEmpty()); --nFreeFromPos, ++aIter) @@ -1514,8 +1514,8 @@ void OTableEditorCtrl::SetPrimaryKey( bool bSet ) MultiSelection aDeletedPrimKeys; aDeletedPrimKeys.SetTotalRange( Range(0,GetRowCount()) ); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end(); for(sal_Int32 nRow = 0;aIter != aEnd;++aIter,++nRow) { OFieldDescription* pFieldDescr = (*aIter)->GetActFieldDescr(); @@ -1557,8 +1557,8 @@ bool OTableEditorCtrl::IsPrimaryKey() { // Are all marked fields part of the Primary Key ? long nPrimaryKeys = 0; - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_pRowList->begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_pRowList->end(); for(sal_Int32 nRow=0;aIter != aEnd;++aIter,++nRow) { if( IsRowSelected(nRow) && !(*aIter)->IsPrimaryKey() ) diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 0c6a44d6e73d..4eb3426b16b7 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -43,7 +43,7 @@ namespace dbaui NONE }; - ::std::vector< ::std::shared_ptr<OTableRow> >* m_pRowList; + std::vector< std::shared_ptr<OTableRow> >* m_pRowList; VclPtr<OSQLNameEdit> pNameCell; VclPtr< ::svt::ListBoxControl> pTypeCell; @@ -51,7 +51,7 @@ namespace dbaui VclPtr<Edit> pDescrCell; VclPtr<OTableFieldDescWin> pDescrWin; // properties of one column - ::std::shared_ptr<OTableRow> pActRow; + std::shared_ptr<OTableRow> pActRow; ImplSVEvent * nCutEvent; ImplSVEvent * nPasteEvent; @@ -143,9 +143,9 @@ namespace dbaui virtual OTableDesignView* GetView() const override; - ::std::vector< ::std::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; } + std::vector< std::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; } - const ::std::shared_ptr<OTableRow>& GetActRow(){ return pActRow; } + const std::shared_ptr<OTableRow>& GetActRow(){ return pActRow; } void CellModified( long nRow, sal_uInt16 nColId ); void SetReadOnly( bool bRead ); diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 7d5318942bc3..68ec90e114b1 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -190,14 +190,14 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const aReturn.bEnabled = true; break; case ID_BROWSER_SAVEDOC: - aReturn.bEnabled = isEditable() && ::std::any_of(m_vRowList.begin(),m_vRowList.end(),::std::mem_fn(&OTableRow::isValid)); + aReturn.bEnabled = isEditable() && std::any_of(m_vRowList.begin(),m_vRowList.end(),std::mem_fn(&OTableRow::isValid)); break; case ID_BROWSER_SAVEASDOC: aReturn.bEnabled = isConnected() && isEditable(); if ( aReturn.bEnabled ) { - aReturn.bEnabled = ::std::any_of(m_vRowList.begin(),m_vRowList.end(), - ::std::mem_fn(&OTableRow::isValid)); + aReturn.bEnabled = std::any_of(m_vRowList.begin(),m_vRowList.end(), + std::mem_fn(&OTableRow::isValid)); } break; @@ -219,8 +219,8 @@ FeatureState OTableController::GetState(sal_uInt16 _nId) const ); if ( aReturn.bEnabled ) { - aReturn.bEnabled = ::std::any_of(m_vRowList.begin(),m_vRowList.end(), - ::std::mem_fn(&OTableRow::isValid)); + aReturn.bEnabled = std::any_of(m_vRowList.begin(),m_vRowList.end(), + std::mem_fn(&OTableRow::isValid)); } break; default: @@ -548,8 +548,8 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) bool bCheck = true; if ( isModified() ) { - if ( ::std::any_of(m_vRowList.begin(),m_vRowList.end(), - ::std::mem_fn(&OTableRow::isValid)) ) + if ( std::any_of(m_vRowList.begin(),m_vRowList.end(), + std::mem_fn(&OTableRow::isValid)) ) { ScopedVclPtrInstance<MessageDialog> aQry(getView(), "TableDesignSaveModifiedDialog", "dbaccess/ui/tabledesignsavemodifieddialog.ui"); @@ -676,8 +676,8 @@ void OTableController::appendColumns(Reference<XColumnsSupplier>& _rxColSup, boo Reference<XAppend> xAppend(xColumns,UNO_QUERY); OSL_ENSURE(xAppend.is(),"No XAppend Interface!"); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); for(;aIter != aEnd;++aIter) { OSL_ENSURE(*aIter,"OTableRow is null!"); @@ -863,8 +863,8 @@ void OTableController::loadData() for(;pKeyBegin != pKeyEnd;++pKeyBegin) { - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator rowIter = m_vRowList.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator rowEnd = m_vRowList.end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator rowIter = m_vRowList.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator rowEnd = m_vRowList.end(); for(;rowIter != rowEnd;++rowIter) { if((*rowIter)->GetActFieldDescr()->GetName() == *pKeyBegin) @@ -907,8 +907,8 @@ bool OTableController::checkColumns(bool _bNew) DatabaseMetaData aMetaData( getConnection() ); ::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); for(;aIter != aEnd;++aIter) { OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr(); @@ -916,7 +916,7 @@ bool OTableController::checkColumns(bool _bNew) { bFoundPKey |= (*aIter)->IsPrimaryKey(); // first check for duplicate names - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter2 = aIter+1; + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter2 = aIter+1; for(;aIter2 != aEnd;++aIter2) { OFieldDescription* pCompareDesc = (*aIter2)->GetActFieldDescr(); @@ -993,8 +993,8 @@ void OTableController::alterColumns() comphelper::UStringMixLess( !xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers())); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); // first look for columns where something other than the name changed sal_Int32 nPos = 0; for(;aIter != aEnd;++aIter,++nPos) @@ -1436,8 +1436,8 @@ void OTableController::reSyncRows() { bool bAlterAllowed = isAlterAllowed(); bool bAddAllowed = isAddAllowed(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); for(;aIter != aEnd;++aIter) { OSL_ENSURE(*aIter,"OTableRow is null!"); @@ -1461,8 +1461,8 @@ OUString OTableController::createUniqueName(const OUString& _rName) ::comphelper::UStringMixEqual bCase(!xMetaData.is() || xMetaData->supportsMixedCaseQuotedIdentifiers()); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); for(sal_Int32 i=0;aIter != aEnd;++aIter) { OFieldDescription* pFieldDesc = (*aIter)->GetActFieldDescr(); @@ -1513,8 +1513,8 @@ void OTableController::reload() sal_Int32 OTableController::getFirstEmptyRowPosition() { sal_Int32 nRet = -1; - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vRowList.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vRowList.end(); for(;aIter != aEnd;++aIter) { if ( !*aIter || !(*aIter)->GetActFieldDescr() || (*aIter)->GetActFieldDescr()->GetName().isEmpty() ) diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index 9a8c15fc2c91..586b3216e380 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -26,7 +26,7 @@ namespace dbaui { using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; - OTableRowExchange::OTableRowExchange(const ::std::vector< std::shared_ptr<OTableRow> >& _rvTableRow) + OTableRowExchange::OTableRowExchange(const std::vector< std::shared_ptr<OTableRow> >& _rvTableRow) : m_vTableRow(_rvTableRow) { } @@ -34,12 +34,12 @@ namespace dbaui { if(nUserObjectId == SotClipboardFormatId::SBA_TABED) { - ::std::vector< std::shared_ptr<OTableRow> >* pRows = static_cast< ::std::vector< std::shared_ptr<OTableRow> >* >(pUserObject); + std::vector< std::shared_ptr<OTableRow> >* pRows = static_cast< std::vector< std::shared_ptr<OTableRow> >* >(pUserObject); if(pRows) { (*rxOStm).WriteInt32( pRows->size() ); // first stream the size - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = pRows->begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end(); for(;aIter != aEnd;++aIter) WriteOTableRow(*rxOStm, **aIter); return true; diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index bd97f0618613..e23b4e87ddb8 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -160,7 +160,7 @@ OTableEditorDelUndoAct::OTableEditorDelUndoAct( OTableEditorCtrl* pOwner) : OTableEditorUndoAct( pOwner ,STR_TABED_UNDO_ROWDELETED) { // fill DeletedRowList - ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pOwner->GetRowList(); long nIndex = pOwner->FirstSelectedRow(); std::shared_ptr<OTableRow> pOriginalRow; std::shared_ptr<OTableRow> pNewRow; @@ -184,11 +184,11 @@ void OTableEditorDelUndoAct::Undo() { // Insert the deleted line sal_uLong nPos; - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_aDeletedRows.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_aDeletedRows.end(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_aDeletedRows.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_aDeletedRows.end(); std::shared_ptr<OTableRow> pNewOrigRow; - ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); for(;aIter != aEnd;++aIter) { @@ -206,9 +206,9 @@ void OTableEditorDelUndoAct::Redo() { // delete line again sal_uLong nPos; - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_aDeletedRows.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_aDeletedRows.end(); - ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_aDeletedRows.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_aDeletedRows.end(); + std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); for(;aIter != aEnd;++aIter) { @@ -224,7 +224,7 @@ void OTableEditorDelUndoAct::Redo() // class OTableEditorInsUndoAct OTableEditorInsUndoAct::OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition , - const ::std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows) + const std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows) :OTableEditorUndoAct( pOwner,STR_TABED_UNDO_ROWINSERTED ) ,m_vInsertedRows(_vInsertedRows) ,m_nInsPos( nInsertPosition ) @@ -239,7 +239,7 @@ OTableEditorInsUndoAct::~OTableEditorInsUndoAct() void OTableEditorInsUndoAct::Undo() { // delete lines again - ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); for( long i=(m_nInsPos+m_vInsertedRows.size()-1); i>(m_nInsPos-1); i-- ) { pOriginalRows->erase(pOriginalRows->begin()+i); @@ -256,9 +256,9 @@ void OTableEditorInsUndoAct::Redo() // insert lines again long nInsertRow = m_nInsPos; std::shared_ptr<OTableRow> pRow; - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vInsertedRows.begin(); - ::std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vInsertedRows.end(); - ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aIter = m_vInsertedRows.begin(); + std::vector< std::shared_ptr<OTableRow> >::const_iterator aEnd = m_vInsertedRows.end(); + std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList(); for(;aIter != aEnd;++aIter) { pRow.reset(new OTableRow( **aIter )); @@ -287,7 +287,7 @@ OTableEditorInsNewUndoAct::~OTableEditorInsNewUndoAct() void OTableEditorInsNewUndoAct::Undo() { // delete inserted lines - ::std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >* pOriginalRows = pTabEdCtrl->GetRowList(); for( long i=(m_nInsPos+m_nInsRows-1); i>(m_nInsPos-1); i-- ) { @@ -303,7 +303,7 @@ void OTableEditorInsNewUndoAct::Undo() void OTableEditorInsNewUndoAct::Redo() { // insert lines again - ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList(); for( long i=m_nInsPos; i<(m_nInsPos+m_nInsRows); i++ ) pRowList->insert( pRowList->begin()+i,std::make_shared<OTableRow>() ); @@ -329,7 +329,7 @@ OPrimKeyUndoAct::~OPrimKeyUndoAct() void OPrimKeyUndoAct::Undo() { - ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList(); std::shared_ptr<OTableRow> pRow; long nIndex; @@ -355,7 +355,7 @@ void OPrimKeyUndoAct::Undo() void OPrimKeyUndoAct::Redo() { - ::std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList(); + std::vector< std::shared_ptr<OTableRow> >* pRowList = pTabEdCtrl->GetRowList(); long nIndex; // delete the deleted keys diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index afb75c6419c2..37b990a586f8 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -88,7 +88,7 @@ namespace dbaui class OTableEditorDelUndoAct : public OTableEditorUndoAct { protected: - ::std::vector< std::shared_ptr<OTableRow> > m_aDeletedRows; + std::vector< std::shared_ptr<OTableRow> > m_aDeletedRows; virtual void Undo() override; virtual void Redo() override; @@ -100,7 +100,7 @@ namespace dbaui class OTableEditorInsUndoAct : public OTableEditorUndoAct { protected: - ::std::vector< std::shared_ptr<OTableRow> > m_vInsertedRows; + std::vector< std::shared_ptr<OTableRow> > m_vInsertedRows; long m_nInsPos; virtual void Undo() override; @@ -108,7 +108,7 @@ namespace dbaui public: OTableEditorInsUndoAct( OTableEditorCtrl* pOwner, long nInsertPosition, - const ::std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows); + const std::vector< std::shared_ptr<OTableRow> >& _vInsertedRows); virtual ~OTableEditorInsUndoAct() override; }; diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index b68b0a6f30d7..6bf46be55a74 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -234,7 +234,7 @@ namespace dbaui /** extracts the source object (table or query) described by the given descriptor, relative to m_xSourceConnection */ - ::std::unique_ptr< ICopyTableSourceObject > + std::unique_ptr< ICopyTableSourceObject > impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType @@ -333,7 +333,7 @@ private: // source SharedConnection m_xSourceConnection; sal_Int32 m_nCommandType; - ::std::unique_ptr< ICopyTableSourceObject > + std::unique_ptr< ICopyTableSourceObject > m_pSourceObject; Reference< XResultSet > m_xSourceResultSet; Sequence< Any > m_aSourceSelection; @@ -711,7 +711,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X } -::std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const +std::unique_ptr< ICopyTableSourceObject > CopyTableWizard::impl_extractSourceObject_throw( const Reference< XPropertySet >& _rxDescriptor, sal_Int32& _out_rCommandType ) const { OSL_PRECOND( _rxDescriptor.is() && m_xSourceConnection.is(), "CopyTableWizard::impl_extractSourceObject_throw: illegal arguments!" ); @@ -728,7 +728,7 @@ void CopyTableWizard::impl_checkForUnsupportedSettings_throw( const Reference< X OSL_VERIFY( _rxDescriptor->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand ); OSL_VERIFY( _rxDescriptor->getPropertyValue( PROPERTY_COMMAND_TYPE ) >>= _out_rCommandType ); - ::std::unique_ptr< ICopyTableSourceObject > pSourceObject; + std::unique_ptr< ICopyTableSourceObject > pSourceObject; Reference< XNameAccess > xContainer; switch ( _out_rCommandType ) { @@ -968,7 +968,7 @@ namespace class ValueTransfer { public: - ValueTransfer( const sal_Int32& _rSourcePos, const sal_Int32& _rDestPos, const ::std::vector< sal_Int32 >& _rColTypes, + ValueTransfer( const sal_Int32& _rSourcePos, const sal_Int32& _rDestPos, const std::vector< sal_Int32 >& _rColTypes, const Reference< XRow >& _rxSource, const Reference< XParameters >& _rxDest ) :m_rSourcePos( _rSourcePos ) ,m_rDestPos( _rDestPos ) @@ -1003,7 +1003,7 @@ namespace private: const sal_Int32& m_rSourcePos; const sal_Int32& m_rDestPos; - const ::std::vector< sal_Int32 > m_rColTypes; + const std::vector< sal_Int32 > m_rColTypes; const Reference< XRow > m_xSource; const Reference< XParameters > m_xDest; }; @@ -1106,11 +1106,11 @@ void CopyTableWizard::impl_copyRows_throw( const Reference< XResultSet >& _rxSou // we need a vector which all types sal_Int32 nCount = xMeta->getColumnCount(); - ::std::vector< sal_Int32 > aSourceColTypes; + std::vector< sal_Int32 > aSourceColTypes; aSourceColTypes.reserve( nCount + 1 ); aSourceColTypes.push_back( -1 ); // just to avoid a every time i-1 call - ::std::vector< sal_Int32 > aSourcePrec; + std::vector< sal_Int32 > aSourcePrec; aSourcePrec.reserve( nCount + 1 ); aSourcePrec.push_back( -1 ); // just to avoid a every time i-1 call |