From 16a3594e6a3bcb5a247a526d199db899a438ad50 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 19 Dec 2017 11:00:13 +0200 Subject: inline typedefs in connectivity/StdTypeDefs Change-Id: I614833ed2418ff99057c7d496ddb64f06e8395db Reviewed-on: https://gerrit.libreoffice.org/46809 Tested-by: Jenkins Reviewed-by: Noel Grandin --- connectivity/inc/pch/precompiled_mysql.hxx | 1 - connectivity/source/commontools/TColumnsHelper.cxx | 2 +- connectivity/source/commontools/TKeys.cxx | 2 +- connectivity/source/commontools/TSkipDeletedSet.cxx | 16 +--------------- connectivity/source/commontools/TTableHelper.cxx | 12 ++++++------ connectivity/source/drivers/ado/ACatalog.cxx | 8 ++++---- .../source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 18 +++++++++--------- connectivity/source/drivers/ado/AGroup.cxx | 2 +- connectivity/source/drivers/ado/AIndex.cxx | 2 +- connectivity/source/drivers/ado/AKey.cxx | 2 +- connectivity/source/drivers/ado/ATable.cxx | 6 +++--- connectivity/source/drivers/ado/AUser.cxx | 2 +- connectivity/source/drivers/calc/CCatalog.cxx | 2 +- connectivity/source/drivers/component/CTable.cxx | 2 +- connectivity/source/drivers/dbase/DCatalog.cxx | 2 +- connectivity/source/drivers/dbase/DIndex.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 4 ++-- connectivity/source/drivers/evoab2/NCatalog.cxx | 2 +- connectivity/source/drivers/evoab2/NColumns.hxx | 2 +- connectivity/source/drivers/evoab2/NTable.cxx | 2 +- connectivity/source/drivers/evoab2/NTables.hxx | 2 +- connectivity/source/drivers/file/FCatalog.cxx | 2 +- connectivity/source/drivers/file/FTable.cxx | 2 +- connectivity/source/drivers/firebird/Catalog.cxx | 4 ++-- connectivity/source/drivers/firebird/Columns.cxx | 2 +- connectivity/source/drivers/firebird/Columns.hxx | 2 +- connectivity/source/drivers/firebird/Keys.cxx | 2 +- connectivity/source/drivers/firebird/Keys.hxx | 2 +- connectivity/source/drivers/firebird/Table.cxx | 6 +++--- connectivity/source/drivers/firebird/Table.hxx | 6 +++--- connectivity/source/drivers/firebird/Tables.hxx | 2 +- connectivity/source/drivers/firebird/Users.cxx | 2 +- connectivity/source/drivers/firebird/Users.hxx | 2 +- connectivity/source/drivers/flat/ECatalog.cxx | 2 +- connectivity/source/drivers/flat/ETable.cxx | 2 +- connectivity/source/drivers/hsqldb/HCatalog.cxx | 8 ++++---- connectivity/source/drivers/hsqldb/HColumns.cxx | 2 +- connectivity/source/drivers/hsqldb/HTable.cxx | 6 +++--- connectivity/source/drivers/hsqldb/HUsers.cxx | 2 +- connectivity/source/drivers/hsqldb/HViews.cxx | 2 +- connectivity/source/drivers/macab/MacabCatalog.cxx | 2 +- connectivity/source/drivers/macab/MacabColumns.cxx | 2 +- connectivity/source/drivers/macab/MacabColumns.hxx | 2 +- connectivity/source/drivers/macab/MacabTable.cxx | 2 +- connectivity/source/drivers/macab/MacabTables.hxx | 2 +- connectivity/source/drivers/mork/MCatalog.cxx | 2 +- connectivity/source/drivers/mork/MColumns.hxx | 2 +- connectivity/source/drivers/mork/MTable.cxx | 6 +++--- connectivity/source/drivers/mork/MTable.hxx | 6 +++--- connectivity/source/drivers/mork/MTables.hxx | 2 +- connectivity/source/drivers/mysql/YCatalog.cxx | 8 ++++---- connectivity/source/drivers/mysql/YColumns.cxx | 2 +- connectivity/source/drivers/mysql/YTable.cxx | 8 ++++---- connectivity/source/drivers/mysql/YUsers.cxx | 2 +- .../source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 6 +++--- connectivity/source/drivers/writer/WCatalog.cxx | 2 +- connectivity/source/drivers/writer/WTable.cxx | 1 - .../source/inc/FDatabaseMetaDataResultSetMetaData.hxx | 1 - connectivity/source/inc/ado/AColumns.hxx | 2 +- .../source/inc/ado/ADatabaseMetaDataResultSet.hxx | 5 ++--- connectivity/source/inc/ado/AGroups.hxx | 2 +- connectivity/source/inc/ado/AIndexes.hxx | 2 +- connectivity/source/inc/ado/AKeys.hxx | 2 +- connectivity/source/inc/ado/ATables.hxx | 2 +- connectivity/source/inc/ado/AUsers.hxx | 2 +- connectivity/source/inc/ado/AViews.hxx | 2 +- connectivity/source/inc/ado/Aolewrap.hxx | 3 +-- connectivity/source/inc/calc/CTables.hxx | 2 +- connectivity/source/inc/component/CColumns.hxx | 2 +- connectivity/source/inc/dbase/DColumns.hxx | 2 +- connectivity/source/inc/dbase/DIndexColumns.hxx | 2 +- connectivity/source/inc/dbase/DIndexes.hxx | 2 +- connectivity/source/inc/dbase/DTables.hxx | 2 +- connectivity/source/inc/file/FColumns.hxx | 2 +- connectivity/source/inc/file/FResultSet.hxx | 1 - connectivity/source/inc/file/FTables.hxx | 2 +- connectivity/source/inc/flat/EColumns.hxx | 2 +- connectivity/source/inc/flat/ETables.hxx | 2 +- connectivity/source/inc/hsqldb/HCatalog.hxx | 3 +-- connectivity/source/inc/hsqldb/HColumns.hxx | 2 +- connectivity/source/inc/hsqldb/HTable.hxx | 6 +++--- connectivity/source/inc/hsqldb/HTables.hxx | 2 +- connectivity/source/inc/hsqldb/HUsers.hxx | 2 +- connectivity/source/inc/hsqldb/HViews.hxx | 2 +- connectivity/source/inc/mysql/YCatalog.hxx | 3 +-- connectivity/source/inc/mysql/YColumns.hxx | 2 +- connectivity/source/inc/mysql/YTable.hxx | 6 +++--- connectivity/source/inc/mysql/YTables.hxx | 2 +- connectivity/source/inc/mysql/YUsers.hxx | 2 +- connectivity/source/inc/mysql/YViews.hxx | 2 +- .../source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 5 ++--- connectivity/source/inc/writer/WTables.hxx | 2 +- connectivity/source/sdbcx/VCatalog.cxx | 2 +- connectivity/source/sdbcx/VCollection.cxx | 8 ++++---- 94 files changed, 140 insertions(+), 163 deletions(-) (limited to 'connectivity') diff --git a/connectivity/inc/pch/precompiled_mysql.hxx b/connectivity/inc/pch/precompiled_mysql.hxx index a72882480159..6eb7e071128d 100644 --- a/connectivity/inc/pch/precompiled_mysql.hxx +++ b/connectivity/inc/pch/precompiled_mysql.hxx @@ -161,7 +161,6 @@ #include #include #include -#include #include #include #include diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index ff585a6e4993..700de660730a 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -61,7 +61,7 @@ namespace connectivity OColumnsHelper::OColumnsHelper( ::cppu::OWeakObject& _rParent ,bool _bCase ,::osl::Mutex& _rMutex - ,const TStringVector &_rVector + ,const ::std::vector< OUString> &_rVector ,bool _bUseHardRef ) : OCollection(_rParent,_bCase,_rMutex,_rVector,false,_bUseHardRef) ,m_pTable(nullptr) diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 6b3b8dae0e7a..6736aae96c2e 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::lang; OKeysHelper::OKeysHelper( OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const TStringVector& _rVector + const ::std::vector< OUString>& _rVector ) : OKeys_BASE(*_pTable,true,_rMutex,_rVector,true) ,m_pTable(_pTable) { diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx index adddb809d536..d63bc5e23275 100644 --- a/connectivity/source/commontools/TSkipDeletedSet.cxx +++ b/connectivity/source/commontools/TSkipDeletedSet.cxx @@ -226,7 +226,6 @@ bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool _bRetrieveData) void OSkipDeletedSet::clear() { std::vector().swap(m_aBookmarksPositions); - //TInt2IntMap().swap(m_aBookmarks); } sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const @@ -234,18 +233,12 @@ sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const std::vector::const_iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos); if ( aFind != m_aBookmarksPositions.end() ) return (aFind - m_aBookmarksPositions.begin()) + 1; - /*TInt2IntMap::const_iterator aFind = m_aBookmarks.find(_nPos); - OSL_ENSURE(aFind != m_aBookmarks.end(),"OSkipDeletedSet::getMappedPosition() invalid bookmark!"); - return aFind->second;*/ OSL_FAIL("Why!"); return -1; } void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos) { - //OSL_ENSURE(m_aBookmarks.find(_nPos) == m_aBookmarks.end(),"OSkipDeletedSet::insertNewPosition: Invalid position"); - //m_aBookmarksPositions.push_back(m_aBookmarks.emplace( _nPos,m_aBookmarksPositions.size()+1)).first); - //OSL_ENSURE(std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos"); m_aBookmarksPositions.push_back(_nPos); } @@ -254,15 +247,8 @@ void OSkipDeletedSet::deletePosition(sal_Int32 _nBookmark) std::vector::iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark); if ( aFind != m_aBookmarksPositions.end() ) { - //TInt2IntMap::iterator aFind = m_aBookmarks.find(_nPos); - //OSL_ENSURE(aFind != m_aBookmarks.end(),"OSkipDeletedSet::deletePosition() bookmark not found!"); - //TInt2IntMap::iterator aIter = aFind; m_aBookmarksPositions.erase(aFind); - //for (; aFind != m_aBookmarksPositions.end() ; ++aIter) - // --(aFind->second); - } // if ( aFind != m_aBookmarksPositions.end() ) - //m_aBookmarksPositions.erase(m_aBookmarksPositions.begin() + aFind->second-1); - //m_aBookmarks.erase(_nPos); + } } diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index f00e7e50323a..a30a19985394 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -261,7 +261,7 @@ namespace void OTableHelper::refreshColumns() { - TStringVector aVector; + ::std::vector< OUString> aVector; if(!isNew()) { Any aCatalog; @@ -294,7 +294,7 @@ void OTableHelper::refreshColumns() std::transform( aSortedColumns.begin(), aSortedColumns.end(), - std::insert_iterator< TStringVector >( aVector, aVector.begin() ), + std::insert_iterator< ::std::vector< OUString> >( aVector, aVector.begin() ), ::o3tl::select2nd< std::map< OrdinalPosition, OUString >::value_type >() ); } @@ -320,7 +320,7 @@ const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) con return pRet; } -void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames) +void OTableHelper::refreshPrimaryKeys(::std::vector< OUString>& _rNames) { Any aCatalog; if ( !m_CatalogName.isEmpty() ) @@ -356,7 +356,7 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames) ::comphelper::disposeComponent(xResult); } -void OTableHelper::refreshForeignKeys(TStringVector& _rNames) +void OTableHelper::refreshForeignKeys(::std::vector< OUString>& _rNames) { Any aCatalog; if ( !m_CatalogName.isEmpty() ) @@ -423,7 +423,7 @@ void OTableHelper::refreshKeys() { m_pImpl->m_aKeys.clear(); - TStringVector aNames; + ::std::vector< OUString> aNames; if(!isNew()) { @@ -441,7 +441,7 @@ void OTableHelper::refreshKeys() void OTableHelper::refreshIndexes() { - TStringVector aVector; + ::std::vector< OUString> aVector; if(!isNew()) { // fill indexes diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx index 3add7decb16e..cb44200f7920 100644 --- a/connectivity/source/drivers/ado/ACatalog.cxx +++ b/connectivity/source/drivers/ado/ACatalog.cxx @@ -45,7 +45,7 @@ OCatalog::~OCatalog() void OCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOTables aTables(m_aCatalog.get_Tables()); if ( aTables.IsValid() ) @@ -74,7 +74,7 @@ void OCatalog::refreshTables() void OCatalog::refreshViews() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOViews aViews = m_aCatalog.get_Views(); aViews.fillElementNames(aVector); @@ -87,7 +87,7 @@ void OCatalog::refreshViews() void OCatalog::refreshGroups() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOGroups aGroups = m_aCatalog.get_Groups(); aGroups.fillElementNames(aVector); @@ -100,7 +100,7 @@ void OCatalog::refreshGroups() void OCatalog::refreshUsers() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOUsers aUsers = m_aCatalog.get_Users(); aUsers.fillElementNames(aVector); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index fa820e900645..19f4d9b45749 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -789,7 +789,7 @@ void ODatabaseMetaDataResultSet::setProceduresMap() m_aColMapping.push_back(6); m_aColMapping.push_back(4); - TInt2IntMap aMap; + ::std::map aMap; aMap[DB_PT_UNKNOWN] = ProcedureResult::UNKNOWN; aMap[DB_PT_PROCEDURE] = ProcedureResult::NONE; aMap[DB_PT_FUNCTION] = ProcedureResult::RETURN; @@ -854,7 +854,7 @@ void ODatabaseMetaDataResultSet::setColumnsMap() m_aColMapping.push_back(7); m_aColMapping.push_back(11); - TInt2IntMap aMap; + ::std::map aMap; aMap[adEmpty] = ADOS::MapADOType2Jdbc(adEmpty); aMap[adTinyInt] = ADOS::MapADOType2Jdbc(adTinyInt); aMap[adSmallInt] = ADOS::MapADOType2Jdbc(adSmallInt); @@ -934,7 +934,7 @@ void ODatabaseMetaDataResultSet::setProcedureColumnsMap() m_aColMapping.push_back(9); m_aColMapping.push_back(14); - TInt2IntMap aMap; + ::std::map aMap; aMap[DBTYPE_EMPTY] = DataType::SQLNULL; aMap[DBTYPE_NULL] = DataType::SQLNULL; aMap[DBTYPE_I2] = DataType::SMALLINT; @@ -1017,7 +1017,7 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap() m_aColMapping.push_back(23); m_aColMapping.push_back(24); - TInt2IntMap aMap; + ::std::map aMap; aMap[DBPROPVAL_IT_HASH] = IndexType::HASHED; aMap[DBPROPVAL_IT_CONTENT] = IndexType::OTHER; aMap[DBPROPVAL_IT_OTHER] = IndexType::OTHER; @@ -1025,7 +1025,7 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap() m_aValueRange[10] = aMap; - TInt2IntMap aMap2; + ::std::map aMap2; aMap[0] = 1; aMap[1] = 0; m_aValueRange[8] = aMap2; @@ -1106,7 +1106,7 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(bool _bJetEngine) m_aStrValueRange[18] = aMap1; - TInt2IntMap aMap; + ::std::map aMap; aMap[adEmpty] = ADOS::MapADOType2Jdbc(adEmpty); aMap[adTinyInt] = ADOS::MapADOType2Jdbc(adTinyInt); aMap[adSmallInt] = ADOS::MapADOType2Jdbc(adSmallInt); @@ -1150,14 +1150,14 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(bool _bJetEngine) m_aValueRange[2] = aMap; - TInt2IntMap aColumnValueMapping; + ::std::map aColumnValueMapping; aColumnValueMapping[VARIANT_FALSE] = ColumnValue::NO_NULLS; aColumnValueMapping[VARIANT_TRUE] = ColumnValue::NULLABLE; m_aValueRange[7] = aColumnValueMapping; // now adjust the column mapping // OJ 24.01.2002 96860 - TInt2IntMap aSerachMapping; + ::std::map aSerachMapping; aSerachMapping[DB_UNSEARCHABLE] = ColumnSearch::NONE; aSerachMapping[DB_LIKE_ONLY] = ColumnSearch::CHAR; aSerachMapping[DB_ALL_EXCEPT_LIKE] = ColumnSearch::BASIC; @@ -1165,7 +1165,7 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(bool _bJetEngine) m_aValueRange[9] = aSerachMapping; - TInt2IntMap aCurrencyMapping; + ::std::map aCurrencyMapping; m_aValueRange[11] = aCurrencyMapping; ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this); diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index 230bac43ac52..67dc08a055e6 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -71,7 +71,7 @@ OAdoGroup::OAdoGroup(OCatalog* _pParent,bool _bCase, const OUString& Name) : OGr void OAdoGroup::refreshUsers() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOUsers aUsers = m_aGroup.get_Users(); aUsers.fillElementNames(aVector); diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index e4052431264e..eb5d2dbde812 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -56,7 +56,7 @@ OAdoIndex::OAdoIndex(bool _bCase,OConnection* _pConnection) void OAdoIndex::refreshColumns() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOColumns aColumns; if ( m_aIndex.IsValid() ) diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index 431955ce1b3a..bcf31b79d076 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -52,7 +52,7 @@ OAdoKey::OAdoKey(bool _bCase,OConnection* _pConnection) void OAdoKey::refreshColumns() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOColumns aColumns; if ( m_aKey.IsValid() ) diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 8c615e0acf08..c1688a152cc4 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -75,7 +75,7 @@ void SAL_CALL OAdoTable::disposing() void OAdoTable::refreshColumns() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOColumns aColumns; if ( m_aTable.IsValid() ) @@ -92,7 +92,7 @@ void OAdoTable::refreshColumns() void OAdoTable::refreshKeys() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOKeys aKeys; if(m_aTable.IsValid()) @@ -109,7 +109,7 @@ void OAdoTable::refreshKeys() void OAdoTable::refreshIndexes() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOIndexes aIndexes; if(m_aTable.IsValid()) diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 89c6d63b61f6..50e270477ce9 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -57,7 +57,7 @@ OAdoUser::OAdoUser(OCatalog* _pParent,bool _bCase, const OUString& Name) void OAdoUser::refreshGroups() { - TStringVector aVector; + ::std::vector< OUString> aVector; WpADOGroups aGroups(m_aUser.get_Groups()); aGroups.fillElementNames(aVector); if(m_pGroups) diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx index 78bae9c6a7c8..7ac5af5398d4 100644 --- a/connectivity/source/drivers/calc/CCatalog.cxx +++ b/connectivity/source/drivers/calc/CCatalog.cxx @@ -38,7 +38,7 @@ OCalcCatalog::OCalcCatalog(OCalcConnection* _pCon) : file::OFileCatalog(_pCon) void OCalcCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > aTypes; OCalcConnection::ODocHolder aDocHolder(static_cast(m_pConnection)); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), diff --git a/connectivity/source/drivers/component/CTable.cxx b/connectivity/source/drivers/component/CTable.cxx index 20f2ad4b7104..a6c0e68248d4 100644 --- a/connectivity/source/drivers/component/CTable.cxx +++ b/connectivity/source/drivers/component/CTable.cxx @@ -84,7 +84,7 @@ void OComponentTable::refreshColumns() { ::osl::MutexGuard aGuard( m_aMutex ); - TStringVector aVector; + ::std::vector< OUString> aVector; OSQLColumns::Vector::const_iterator aEnd = m_aColumns->get().end(); for(OSQLColumns::Vector::const_iterator aIter = m_aColumns->get().begin();aIter != aEnd;++aIter) diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx index e320b620bdf1..8bc06bb98141 100644 --- a/connectivity/source/drivers/dbase/DCatalog.cxx +++ b/connectivity/source/drivers/dbase/DCatalog.cxx @@ -38,7 +38,7 @@ ODbaseCatalog::ODbaseCatalog(ODbaseConnection* _pCon) : file::OFileCatalog(_pCon void ODbaseCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > aTypes; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), "%", "%", aTypes); diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index e4f53723bcc9..92d1d764e01c 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -92,7 +92,7 @@ void ODbaseIndex::refreshColumns() { ::osl::MutexGuard aGuard( m_aMutex ); - TStringVector aVector; + ::std::vector< OUString> aVector; if(!isNew()) { OSL_ENSURE(m_pFileStream,"FileStream is not opened!"); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 8361e29c8faa..c163b3bf4133 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -639,7 +639,7 @@ void ODbaseTable::refreshColumns() { ::osl::MutexGuard aGuard( m_aMutex ); - TStringVector aVector; + ::std::vector< OUString> aVector; aVector.reserve(m_aColumns->get().size()); for(OSQLColumns::Vector::const_iterator aIter = m_aColumns->get().begin();aIter != m_aColumns->get().end();++aIter) @@ -653,7 +653,7 @@ void ODbaseTable::refreshColumns() void ODbaseTable::refreshIndexes() { - TStringVector aVector; + ::std::vector< OUString> aVector; if(m_pFileStream && (!m_pIndexes || m_pIndexes->getCount() == 0)) { INetURLObject aURL; diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index b0f9945b116d..1d8c2924a081 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -39,7 +39,7 @@ OEvoabCatalog::OEvoabCatalog(OEvoabConnection* _pCon) : } void OEvoabCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > aTypes { "TABLE" }; Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), "%", "%", aTypes); diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index 2f04047fb78c..d3038aaa62af 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -37,7 +37,7 @@ namespace connectivity public: OEvoabColumns( OEvoabTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector + const ::std::vector< OUString> &_rVector ) : sdbcx::OCollection(*_pTable,true,_rMutex,_rVector), m_pTable(_pTable) { } diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 160dfd7795d7..f6394a972d32 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.cxx @@ -53,7 +53,7 @@ OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables, void OEvoabTable::refreshColumns() { - TStringVector aVector; + ::std::vector< OUString> aVector; if (!isNew()) { diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index bc886d1d4383..99542ba53e5e 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -34,7 +34,7 @@ namespace connectivity public: OEvoabTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(_rParent,true,_rMutex,_rVector), m_xMetaData(_rMetaData) {} diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index f76f886521e9..fbac414461e6 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -53,7 +53,7 @@ OUString OFileCatalog::buildName(const Reference< XRow >& _xRow) void OFileCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > aTypes; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), "%", "%", aTypes); diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 4a16a9af705e..8d4bded8b121 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -78,7 +78,7 @@ OFileTable::~OFileTable( ) void OFileTable::refreshColumns() { - TStringVector aVector; + ::std::vector< OUString> aVector; Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(Any(), m_SchemaName,m_Name, "%"); diff --git a/connectivity/source/drivers/firebird/Catalog.cxx b/connectivity/source/drivers/firebird/Catalog.cxx index 02883c88c5c0..69329af63500 100644 --- a/connectivity/source/drivers/firebird/Catalog.cxx +++ b/connectivity/source/drivers/firebird/Catalog.cxx @@ -38,7 +38,7 @@ void Catalog::refreshTables() if (!xTables.is()) return; - TStringVector aTableNames; + ::std::vector< OUString> aTableNames; fillNames(xTables, aTableNames); @@ -75,7 +75,7 @@ void Catalog::refreshUsers() if (!xUsers.is()) return; - TStringVector aUserNames; + ::std::vector< OUString> aUserNames; uno::Reference< XRow > xRow(xUsers,UNO_QUERY); while (xUsers->next()) diff --git a/connectivity/source/drivers/firebird/Columns.cxx b/connectivity/source/drivers/firebird/Columns.cxx index 8089cab8c965..38c40820ca60 100644 --- a/connectivity/source/drivers/firebird/Columns.cxx +++ b/connectivity/source/drivers/firebird/Columns.cxx @@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno; Columns::Columns(Table& rTable, Mutex& rMutex, - const TStringVector& rVector): + const ::std::vector< OUString>& rVector): OColumnsHelper(rTable, true, // TODO: is this case sensitivity? rMutex, diff --git a/connectivity/source/drivers/firebird/Columns.hxx b/connectivity/source/drivers/firebird/Columns.hxx index 58c1b33029bd..844d99ee0830 100644 --- a/connectivity/source/drivers/firebird/Columns.hxx +++ b/connectivity/source/drivers/firebird/Columns.hxx @@ -25,7 +25,7 @@ namespace connectivity public: Columns(Table& rTable, ::osl::Mutex& rMutex, - const ::connectivity::TStringVector &_rVector); + const ::std::vector< OUString> &_rVector); }; } // namespace firebird diff --git a/connectivity/source/drivers/firebird/Keys.cxx b/connectivity/source/drivers/firebird/Keys.cxx index f75ced0938c2..90f3966efad7 100644 --- a/connectivity/source/drivers/firebird/Keys.cxx +++ b/connectivity/source/drivers/firebird/Keys.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; -Keys::Keys(Table* pTable, Mutex& rMutex, const TStringVector& rNames): +Keys::Keys(Table* pTable, Mutex& rMutex, const ::std::vector< OUString>& rNames): OKeysHelper(pTable, rMutex, rNames), diff --git a/connectivity/source/drivers/firebird/Keys.hxx b/connectivity/source/drivers/firebird/Keys.hxx index 8fb190f2c9e0..b712ab4122f7 100644 --- a/connectivity/source/drivers/firebird/Keys.hxx +++ b/connectivity/source/drivers/firebird/Keys.hxx @@ -28,7 +28,7 @@ namespace connectivity public: Keys(Table* pTable, ::osl::Mutex& rMutex, - const ::connectivity::TStringVector& rNames); + const ::std::vector< OUString>& rNames); // OKeysHelper / XDrop void dropObject(sal_Int32 nPosition, const ::rtl::OUString& sName) override; diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx index 1cb343750748..76aebaa2b7ef 100644 --- a/connectivity/source/drivers/firebird/Table.cxx +++ b/connectivity/source/drivers/firebird/Table.cxx @@ -88,21 +88,21 @@ void Table::construct() } } //----- OTableHelper --------------------------------------------------------- -OCollection* Table::createColumns(const TStringVector& rNames) +OCollection* Table::createColumns(const ::std::vector< OUString>& rNames) { return new Columns(*this, m_rMutex, rNames); } -OCollection* Table::createKeys(const TStringVector& rNames) +OCollection* Table::createKeys(const ::std::vector< OUString>& rNames) { return new Keys(this, m_rMutex, rNames); } -OCollection* Table::createIndexes(const TStringVector& rNames) +OCollection* Table::createIndexes(const ::std::vector< OUString>& rNames) { return new Indexes(this, m_rMutex, diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx index c1bcc161674b..e0000f6f6e53 100644 --- a/connectivity/source/drivers/firebird/Table.hxx +++ b/connectivity/source/drivers/firebird/Table.hxx @@ -51,11 +51,11 @@ namespace connectivity // OTableHelper virtual ::connectivity::sdbcx::OCollection* createColumns( - const ::connectivity::TStringVector& rNames) override; + const ::std::vector< OUString>& rNames) override; virtual ::connectivity::sdbcx::OCollection* createKeys( - const ::connectivity::TStringVector& rNames) override; + const ::std::vector< OUString>& rNames) override; virtual ::connectivity::sdbcx::OCollection* createIndexes( - const ::connectivity::TStringVector& rNames) override; + const ::std::vector< OUString>& rNames) override; // XAlterTable /** diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx index d391ca8b0999..5c2742659ce5 100644 --- a/connectivity/source/drivers/firebird/Tables.hxx +++ b/connectivity/source/drivers/firebird/Tables.hxx @@ -45,7 +45,7 @@ namespace connectivity Tables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& rMetaData, ::cppu::OWeakObject& rParent, ::osl::Mutex& rMutex, - ::connectivity::TStringVector const & rNames) : sdbcx::OCollection(rParent, true, rMutex, rNames), m_xMetaData(rMetaData) {} + ::std::vector< OUString> const & rNames) : sdbcx::OCollection(rParent, true, rMutex, rNames), m_xMetaData(rMetaData) {} // TODO: we should also implement XDataDescriptorFactory, XRefreshable, // XAppend, etc., but all are optional. diff --git a/connectivity/source/drivers/firebird/Users.cxx b/connectivity/source/drivers/firebird/Users.cxx index edaa9edb6862..0423d9c33181 100644 --- a/connectivity/source/drivers/firebird/Users.cxx +++ b/connectivity/source/drivers/firebird/Users.cxx @@ -30,7 +30,7 @@ using namespace ::com::sun::star::uno; Users::Users(const uno::Reference< XDatabaseMetaData >& rMetaData, OWeakObject& rParent, Mutex& rMutex, - TStringVector const & rNames) : + ::std::vector< OUString> const & rNames) : OCollection(rParent, true, rMutex, diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx index a689e672b5bc..8b307b5d1578 100644 --- a/connectivity/source/drivers/firebird/Users.hxx +++ b/connectivity/source/drivers/firebird/Users.hxx @@ -42,7 +42,7 @@ namespace connectivity Users(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& rMetaData, ::cppu::OWeakObject& rParent, ::osl::Mutex& rMutex, - ::connectivity::TStringVector const & rNames); + ::std::vector< OUString> const & rNames); // TODO: we should also implement XDataDescriptorFactory, XRefreshable, // XAppend, etc., but all are optional. diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx index 3d24b1915ad6..2317722501b5 100644 --- a/connectivity/source/drivers/flat/ECatalog.cxx +++ b/connectivity/source/drivers/flat/ECatalog.cxx @@ -39,7 +39,7 @@ OFlatCatalog::OFlatCatalog(OFlatConnection* _pCon) : file::OFileCatalog(_pCon) void OFlatCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > aTypes; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), "%", "%", aTypes); diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 5fc89925925c..435faf76553c 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -495,7 +495,7 @@ void OFlatTable::refreshColumns() { ::osl::MutexGuard aGuard( m_aMutex ); - TStringVector aVector; + ::std::vector< OUString> aVector; aVector.reserve(m_aColumns->get().size()); for(OSQLColumns::Vector::const_iterator aIter = m_aColumns->get().begin();aIter != m_aColumns->get().end();++aIter) diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index 2bc4c8210c9f..a96ee12bcc8c 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -41,7 +41,7 @@ OHCatalog::OHCatalog(const Reference< XConnection >& _xConnection) : sdbcx::OCat { } -void OHCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStringVector& _rNames) +void OHCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,::std::vector< OUString>& _rNames) { Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), "%", @@ -52,7 +52,7 @@ void OHCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStrin void OHCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > sTableTypes(2); sTableTypes[0] = "VIEW"; @@ -87,7 +87,7 @@ void OHCatalog::refreshViews() { } - TStringVector aVector; + ::std::vector< OUString> aVector; if ( bSupportsViews ) refreshObjects(aTypes,aVector); @@ -103,7 +103,7 @@ void OHCatalog::refreshGroups() void OHCatalog::refreshUsers() { - TStringVector aVector; + ::std::vector< OUString> aVector; Reference< XStatement > xStmt = m_xConnection->createStatement( ); Reference< XResultSet > xResult = xStmt->executeQuery("select User from hsqldb.user group by User"); if ( xResult.is() ) diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx index b5a893188db7..da9b8bbd442b 100644 --- a/connectivity/source/drivers/hsqldb/HColumns.cxx +++ b/connectivity/source/drivers/hsqldb/HColumns.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::lang; OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent ,::osl::Mutex& _rMutex - ,const TStringVector &_rVector + ,const ::std::vector< OUString> &_rVector ) : OColumnsHelper(_rParent,true/*_bCase*/,_rMutex,_rVector,true/*_bUseHardRef*/) { } diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 1c5e091fa5ec..ce9dd4187670 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -109,19 +109,19 @@ void OHSQLTable::construct() return *static_cast(this)->getArrayHelper(isNew() ? 1 : 0); } -sdbcx::OCollection* OHSQLTable::createColumns(const TStringVector& _rNames) +sdbcx::OCollection* OHSQLTable::createColumns(const ::std::vector< OUString>& _rNames) { OHSQLColumns* pColumns = new OHSQLColumns(*this,m_aMutex,_rNames); pColumns->setParent(this); return pColumns; } -sdbcx::OCollection* OHSQLTable::createKeys(const TStringVector& _rNames) +sdbcx::OCollection* OHSQLTable::createKeys(const ::std::vector< OUString>& _rNames) { return new OKeysHelper(this,m_aMutex,_rNames); } -sdbcx::OCollection* OHSQLTable::createIndexes(const TStringVector& _rNames) +sdbcx::OCollection* OHSQLTable::createIndexes(const ::std::vector< OUString>& _rNames) { return new OIndexesHelper(this,m_aMutex,_rNames); } diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index 7c99f53d2694..c6992c9328c3 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::lang; OUsers::OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const css::uno::Reference< css::sdbc::XConnection >& _xConnection, connectivity::sdbcx::IRefreshableUsers* _pParent) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index d254ed16f541..c66d869e09a4 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -51,7 +51,7 @@ typedef connectivity::sdbcx::OCollection OCollection_TYPE; HViews::HViews( const Reference< XConnection >& _rxConnection, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector ) + const ::std::vector< OUString> &_rVector ) :sdbcx::OCollection( _rParent, true, _rMutex, _rVector ) ,m_xConnection( _rxConnection ) ,m_xMetaData( _rxConnection->getMetaData() ) diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 91bec0a78a78..7d613d8a007d 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx @@ -40,7 +40,7 @@ MacabCatalog::MacabCatalog(MacabConnection* _pCon) void MacabCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > aTypes { "%" }; Reference< XResultSet > xResult = m_xMetaData->getTables( Any(), "%", "%", aTypes); diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index df09ef9c7715..45ed77085bfe 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx @@ -85,7 +85,7 @@ void MacabColumns::impl_refresh() MacabColumns::MacabColumns( MacabTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(*_pTable, true, _rMutex, _rVector), m_pTable(_pTable) { diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index 45858d44657e..36da039a9ffc 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.hxx @@ -38,7 +38,7 @@ namespace connectivity public: MacabColumns( MacabTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector); + const ::std::vector< OUString> &_rVector); }; } } diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index 7d855b40cfa3..7b52de538264 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.cxx @@ -61,7 +61,7 @@ MacabTable::MacabTable( sdbcx::OCollection* _pTables, void MacabTable::refreshColumns() { - TStringVector aVector; + ::std::vector< OUString> aVector; if (!isNew()) { diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index eb11ef8e77ab..7e87a473a37d 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -40,7 +40,7 @@ namespace connectivity const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(_rParent,true,_rMutex,_rVector), m_xMetaData(_rMetaData) { } diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index c9f8d759b17b..0322036f7f58 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -41,7 +41,7 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) void OCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > aTypes { "%" }; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), "%", "%", aTypes); diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx index 5610a7652401..ed5c0e5720bb 100644 --- a/connectivity/source/drivers/mork/MColumns.hxx +++ b/connectivity/source/drivers/mork/MColumns.hxx @@ -38,7 +38,7 @@ namespace connectivity public: OColumns( OTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector + const ::std::vector< OUString> &_rVector ) : sdbcx::OCollection(*_pTable, true, _rMutex, _rVector) ,m_pTable(_pTable) {} diff --git a/connectivity/source/drivers/mork/MTable.cxx b/connectivity/source/drivers/mork/MTable.cxx index 1a546f133ebb..76db19fc6915 100644 --- a/connectivity/source/drivers/mork/MTable.cxx +++ b/connectivity/source/drivers/mork/MTable.cxx @@ -36,19 +36,19 @@ OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, } -sdbcx::OCollection* OTable::createColumns( const TStringVector& _rNames ) +sdbcx::OCollection* OTable::createColumns( const ::std::vector< OUString>& _rNames ) { return new OColumns( this, m_aMutex, _rNames ); } -sdbcx::OCollection* OTable::createKeys(const TStringVector& _rNames) +sdbcx::OCollection* OTable::createKeys(const ::std::vector< OUString>& _rNames) { return new OKeysHelper( this, m_aMutex, _rNames ); } -sdbcx::OCollection* OTable::createIndexes(const TStringVector& _rNames) +sdbcx::OCollection* OTable::createIndexes(const ::std::vector< OUString>& _rNames) { return new OIndexesHelper( this, m_aMutex, _rNames ); } diff --git a/connectivity/source/drivers/mork/MTable.hxx b/connectivity/source/drivers/mork/MTable.hxx index 1008eb62f3f8..7cbe216be9ae 100644 --- a/connectivity/source/drivers/mork/MTable.hxx +++ b/connectivity/source/drivers/mork/MTable.hxx @@ -48,9 +48,9 @@ namespace connectivity const OUString& getSchema() const { return m_SchemaName; } // OTableHelper overridables - virtual sdbcx::OCollection* createColumns( const TStringVector& _rNames ) override; - virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames) override; - virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames) override; + virtual sdbcx::OCollection* createColumns( const ::std::vector< OUString>& _rNames ) override; + virtual sdbcx::OCollection* createKeys(const ::std::vector< OUString>& _rNames) override; + virtual sdbcx::OCollection* createIndexes(const ::std::vector< OUString>& _rNames) override; private: using OTable_Base::getConnection; }; diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx index a30174806ec0..ac3730f9aa16 100644 --- a/connectivity/source/drivers/mork/MTables.hxx +++ b/connectivity/source/drivers/mork/MTables.hxx @@ -33,7 +33,7 @@ namespace connectivity virtual void impl_refresh() override; public: OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xMetaData(_rMetaData) {} diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index ed7f95ea0a77..364c4ce80607 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -41,7 +41,7 @@ OMySQLCatalog::OMySQLCatalog(const Reference< XConnection >& _xConnection) : OCa { } -void OMySQLCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStringVector& _rNames) +void OMySQLCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,::std::vector< OUString>& _rNames) { Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), "%", @@ -52,7 +52,7 @@ void OMySQLCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TS void OMySQLCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; Sequence< OUString > sTableTypes(3); sTableTypes[0] = "VIEW"; @@ -75,7 +75,7 @@ void OMySQLCatalog::refreshViews() // as of this writing might not return the proper information in getTableTypes, so // don't rely on it. - TStringVector aVector; + ::std::vector< OUString> aVector; refreshObjects(aTypes,aVector); if ( m_pViews ) @@ -90,7 +90,7 @@ void OMySQLCatalog::refreshGroups() void OMySQLCatalog::refreshUsers() { - TStringVector aVector; + ::std::vector< OUString> aVector; Reference< XStatement > xStmt = m_xConnection->createStatement( ); Reference< XResultSet > xResult = xStmt->executeQuery("SELECT grantee FROM information_schema.user_privileges GROUP BY grantee"); if ( xResult.is() ) diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx index b4b418fb6583..ceae5d44ee48 100644 --- a/connectivity/source/drivers/mysql/YColumns.cxx +++ b/connectivity/source/drivers/mysql/YColumns.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star::lang; OMySQLColumns::OMySQLColumns( ::cppu::OWeakObject& _rParent ,::osl::Mutex& _rMutex - ,const TStringVector &_rVector + ,const ::std::vector< OUString> &_rVector ) : OColumnsHelper(_rParent,true/*_bCase*/,_rMutex,_rVector,true/*_bUseHardRef*/) { } diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index e5ea3168f2ac..9387e3e52cbb 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -66,7 +66,7 @@ namespace connectivity public: OMySQLKeysHelper( OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const TStringVector& _rVector + const ::std::vector< OUString>& _rVector ) : OKeysHelper(_pTable,_rMutex,_rVector){} }; @@ -128,19 +128,19 @@ void OMySQLTable::construct() return *static_cast(this)->getArrayHelper(isNew() ? 1 : 0); } -sdbcx::OCollection* OMySQLTable::createColumns(const TStringVector& _rNames) +sdbcx::OCollection* OMySQLTable::createColumns(const ::std::vector< OUString>& _rNames) { OMySQLColumns* pColumns = new OMySQLColumns(*this,m_aMutex,_rNames); pColumns->setParent(this); return pColumns; } -sdbcx::OCollection* OMySQLTable::createKeys(const TStringVector& _rNames) +sdbcx::OCollection* OMySQLTable::createKeys(const ::std::vector< OUString>& _rNames) { return new OMySQLKeysHelper(this,m_aMutex,_rNames); } -sdbcx::OCollection* OMySQLTable::createIndexes(const TStringVector& _rNames) +sdbcx::OCollection* OMySQLTable::createIndexes(const ::std::vector< OUString>& _rNames) { return new OIndexesHelper(this,m_aMutex,_rNames); } diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index 0b03cf0d87ef..d6982b8c985b 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::lang; OUsers::OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const css::uno::Reference< css::sdbc::XConnection >& _xConnection, connectivity::sdbcx::IRefreshableUsers* _pParent) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index 54dc44decfe9..a5371ac254b6 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -176,7 +176,7 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get if ( !m_aValueRange.empty() ) { - std::map::iterator aValueRangeIter (m_aValueRange.find(columnIndex)); + auto aValueRangeIter = m_aValueRange.find(columnIndex); if ( aValueRangeIter != m_aValueRange.end() ) return static_cast(aValueRangeIter->second[nVal]); } @@ -788,7 +788,7 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nH void ODatabaseMetaDataResultSet::openTypeInfo() { - TInt2IntMap aMap; + ::std::map aMap; aMap[SQL_BIT] = DataType::BIT; aMap[SQL_TINYINT] = DataType::TINYINT; aMap[SQL_SMALLINT] = DataType::SMALLINT; @@ -990,7 +990,7 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, reinterpret_cast(const_cast(pCOL)), SQL_NTS); OTools::ThrowException(m_pConnection.get(),nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this); - TInt2IntMap aMap; + ::std::map aMap; aMap[SQL_BIT] = DataType::BIT; aMap[SQL_TINYINT] = DataType::TINYINT; aMap[SQL_SMALLINT] = DataType::SMALLINT; diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx index 14e15516d007..36b571c24c96 100644 --- a/connectivity/source/drivers/writer/WCatalog.cxx +++ b/connectivity/source/drivers/writer/WCatalog.cxx @@ -40,7 +40,7 @@ OWriterCatalog::OWriterCatalog(OWriterConnection* pConnection) : file::OFileCata void OWriterCatalog::refreshTables() { - TStringVector aVector; + ::std::vector< OUString> aVector; uno::Sequence aTypes; OWriterConnection::ODocHolder aDocHolder(static_cast(m_pConnection)); uno::Reference< sdbc::XResultSet > xResult = m_xMetaData->getTables(uno::Any(), "%", "%", aTypes); diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index ab191b37f995..2c3618cfb1e2 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -43,7 +43,6 @@ #include #include #include -#include #include using namespace ::com::sun::star; diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index 4d00ebf5e3a3..7cd49f4bcf3a 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -25,7 +25,6 @@ #include #include "FDatabaseMetaDataResultSet.hxx" #include "OColumn.hxx" -#include #include namespace connectivity diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx index 44d481f5dcb8..6b605df7cab2 100644 --- a/connectivity/source/inc/ado/AColumns.hxx +++ b/connectivity/source/inc/ado/AColumns.hxx @@ -44,7 +44,7 @@ namespace connectivity public: OColumns( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const WpADOColumns& _rCollection, bool _bCase, OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index ea64856c0aca..4d99bdce387d 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -33,7 +33,6 @@ #include #include #include -#include namespace connectivity { @@ -57,8 +56,8 @@ namespace connectivity { std::vector m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - std::map m_aValueRange; - std::map::iterator m_aValueRangeIter; + std::map > m_aValueRange; + std::map >::iterator m_aValueRangeIter; std::map > m_aStrValueRange; std::map >::iterator m_aStrValueRangeIter; diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx index 24f99aba49ab..1676b9a6c089 100644 --- a/connectivity/source/inc/ado/AGroups.hxx +++ b/connectivity/source/inc/ado/AGroups.hxx @@ -42,7 +42,7 @@ namespace connectivity public: OGroups(OCatalog* _pParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const WpADOGroups& _rCollection,bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx index 0d427d294501..4c253cac5e2e 100644 --- a/connectivity/source/inc/ado/AIndexes.hxx +++ b/connectivity/source/inc/ado/AIndexes.hxx @@ -41,7 +41,7 @@ namespace connectivity public: OIndexes(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const WpADOIndexes& _rCollection, bool _bCase, OConnection* _pConnection) diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx index db904ef5b98c..35ef33e37455 100644 --- a/connectivity/source/inc/ado/AKeys.hxx +++ b/connectivity/source/inc/ado/AKeys.hxx @@ -42,7 +42,7 @@ namespace connectivity public: OKeys(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const WpADOKeys& _rCollection, bool _bCase, OConnection* _pConnection) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx index e3f262d0d632..a65741862702 100644 --- a/connectivity/source/inc/ado/ATables.hxx +++ b/connectivity/source/inc/ado/ATables.hxx @@ -40,7 +40,7 @@ namespace connectivity virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OTables(OCatalog* _pParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const WpADOTables& _rCollection, bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx index a5e0c96f924f..181639196576 100644 --- a/connectivity/source/inc/ado/AUsers.hxx +++ b/connectivity/source/inc/ado/AUsers.hxx @@ -42,7 +42,7 @@ namespace connectivity public: OUsers( OCatalog* _pParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const WpADOUsers& _rCollection, bool _bCase) :sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx index 44078b366481..1ef1a6be31c3 100644 --- a/connectivity/source/inc/ado/AViews.hxx +++ b/connectivity/source/inc/ado/AViews.hxx @@ -42,7 +42,7 @@ namespace connectivity virtual void dropObject(sal_Int32 _nPos,const OUString& _sElementName) override; public: OViews(OCatalog* _pParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, WpADOViews const & _rCollection,bool _bCase) : sdbcx::OCollection(*_pParent,_bCase,_rMutex,_rVector) ,m_aCollection(_rCollection) ,m_pCatalog(_pParent) diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index 63df70cfd6fc..042d5fee6dfc 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -23,7 +23,6 @@ #include #include #include -#include namespace rtl { @@ -177,7 +176,7 @@ namespace connectivity aRet.setWithOutAddRef(pT); return aRet; } - void fillElementNames(TStringVector& _rVector) + void fillElementNames(::std::vector< OUString>& _rVector) { if(IsValid()) { diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx index b88938cd0d06..94d28bdd5478 100644 --- a/connectivity/source/inc/calc/CTables.hxx +++ b/connectivity/source/inc/calc/CTables.hxx @@ -34,7 +34,7 @@ namespace connectivity virtual sdbcx::ObjectType createObject(const OUString& _rName) override; public: OCalcTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : OCalcTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) + const ::std::vector< OUString> &_rVector) : OCalcTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) {} }; } diff --git a/connectivity/source/inc/component/CColumns.hxx b/connectivity/source/inc/component/CColumns.hxx index ab5ebbf12964..99a18f1d21b9 100644 --- a/connectivity/source/inc/component/CColumns.hxx +++ b/connectivity/source/inc/component/CColumns.hxx @@ -34,7 +34,7 @@ namespace connectivity public: OComponentColumns(file::OFileTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector + const ::std::vector< OUString> &_rVector ) : file::OColumns(_pTable,_rMutex,_rVector) {} diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx index 841bba946bb2..c282b43e8480 100644 --- a/connectivity/source/inc/dbase/DColumns.hxx +++ b/connectivity/source/inc/dbase/DColumns.hxx @@ -37,7 +37,7 @@ namespace connectivity public: ODbaseColumns(file::OFileTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector + const ::std::vector< OUString> &_rVector ) : file::OColumns(_pTable,_rMutex,_rVector) {} }; diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx index a6c8858a2438..07aa3d551234 100644 --- a/connectivity/source/inc/dbase/DIndexColumns.hxx +++ b/connectivity/source/inc/dbase/DIndexColumns.hxx @@ -39,7 +39,7 @@ namespace connectivity public: ODbaseIndexColumns( ODbaseIndex* _pIndex, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) , m_pIndex(_pIndex) {} diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx index 34b7699f655c..cccc9347ff99 100644 --- a/connectivity/source/inc/dbase/DIndexes.hxx +++ b/connectivity/source/inc/dbase/DIndexes.hxx @@ -42,7 +42,7 @@ namespace connectivity virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override; public: ODbaseIndexes(ODbaseTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) + const ::std::vector< OUString> &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) , m_pTable(_pTable) {} diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx index f27fb59dbc90..fa1957236c21 100644 --- a/connectivity/source/inc/dbase/DTables.hxx +++ b/connectivity/source/inc/dbase/DTables.hxx @@ -38,7 +38,7 @@ namespace connectivity virtual void dropObject(sal_Int32 _nPos, const OUString& _sElementName) override; public: ODbaseTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : ODbaseTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) + const ::std::vector< OUString> &_rVector) : ODbaseTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) {} virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx index 9e5153bb6943..e34345b44e98 100644 --- a/connectivity/source/inc/file/FColumns.hxx +++ b/connectivity/source/inc/file/FColumns.hxx @@ -40,7 +40,7 @@ namespace connectivity public: OColumns( OFileTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector + const ::std::vector< OUString> &_rVector ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) ,m_pTable(_pTable) {} diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 17094d903f22..13369fceddf5 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index b1090cbf705b..bbc787b57a3f 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.hxx @@ -36,7 +36,7 @@ namespace connectivity virtual void impl_refresh() override; public: OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector) {} virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx index 7580137cdcdc..800ac771fcf4 100644 --- a/connectivity/source/inc/flat/EColumns.hxx +++ b/connectivity/source/inc/flat/EColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity public: OFlatColumns(file::OFileTable* _pTable, ::osl::Mutex& _rMutex, - const TStringVector &_rVector + const ::std::vector< OUString> &_rVector ) : file::OColumns(_pTable,_rMutex,_rVector) {} diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx index 3ba349f67667..69b6f5562be3 100644 --- a/connectivity/source/inc/flat/ETables.hxx +++ b/connectivity/source/inc/flat/ETables.hxx @@ -34,7 +34,7 @@ namespace connectivity virtual sdbcx::ObjectType createObject(const OUString& _rName) override; public: OFlatTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : OFlatTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) + const ::std::vector< OUString> &_rVector) : OFlatTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) {} }; } diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx index 777bcc89e27e..5820f2b82de1 100644 --- a/connectivity/source/inc/hsqldb/HCatalog.hxx +++ b/connectivity/source/inc/hsqldb/HCatalog.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX #include -#include namespace connectivity { @@ -38,7 +37,7 @@ namespace connectivity @param _rNames The container for the names to be filled. */ - void refreshObjects(const css::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames); + void refreshObjects(const css::uno::Sequence< OUString >& _sKindOfObject,::std::vector< OUString>& _rNames); public: // implementation of the pure virtual methods diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx index c639588f2c6f..f3fd008cd92f 100644 --- a/connectivity/source/inc/hsqldb/HColumns.hxx +++ b/connectivity/source/inc/hsqldb/HColumns.hxx @@ -32,7 +32,7 @@ namespace connectivity public: OHSQLColumns( ::cppu::OWeakObject& _rParent ,::osl::Mutex& _rMutex - ,const TStringVector &_rVector + ,const ::std::vector< OUString> &_rVector ); }; diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx index f642d39a35d8..b479039cc7b0 100644 --- a/connectivity/source/inc/hsqldb/HTable.hxx +++ b/connectivity/source/inc/hsqldb/HTable.hxx @@ -47,19 +47,19 @@ namespace connectivity @param _rNames The column names. */ - virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames) override; + virtual sdbcx::OCollection* createColumns(const ::std::vector< OUString>& _rNames) override; /** creates the key collection for the table @param _rNames The key names. */ - virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames) override; + virtual sdbcx::OCollection* createKeys(const ::std::vector< OUString>& _rNames) override; /** creates the index collection for the table @param _rNames The index names. */ - virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames) override; + virtual sdbcx::OCollection* createIndexes(const ::std::vector< OUString>& _rNames) override; /** used to implement the creation of the array helper which is shared amongst all instances of the class. This method needs to be implemented in derived classes. diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index a52d8b3e5e80..bf0580396df2 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -39,7 +39,7 @@ namespace connectivity virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject) override; public: OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xMetaData(_rMetaData) {} diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx index 14d0bbea6306..392b3412a39b 100644 --- a/connectivity/source/inc/hsqldb/HUsers.hxx +++ b/connectivity/source/inc/hsqldb/HUsers.hxx @@ -43,7 +43,7 @@ namespace connectivity public: OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const css::uno::Reference< css::sdbc::XConnection >& _xConnection, connectivity::sdbcx::IRefreshableUsers* _pParent); }; diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index f81a50a8cd9e..6f6724383e32 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.hxx @@ -41,7 +41,7 @@ namespace connectivity public: HViews( const css::uno::Reference< css::sdbc::XConnection >& _rxConnection, - ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector ); + ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::std::vector< OUString> &_rVector ); // only the name is identical to ::cppu::OComponentHelper virtual void disposing() override; diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx index 28fc468454d0..010794968f59 100644 --- a/connectivity/source/inc/mysql/YCatalog.hxx +++ b/connectivity/source/inc/mysql/YCatalog.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YCATALOG_HXX #include -#include namespace connectivity { @@ -38,7 +37,7 @@ namespace connectivity @param _rNames The container for the names to be filled. */ - void refreshObjects(const css::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames); + void refreshObjects(const css::uno::Sequence< OUString >& _sKindOfObject,::std::vector< OUString>& _rNames); public: // implementation of the pure virtual methods diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx index 4157046d4663..9e2d49535149 100644 --- a/connectivity/source/inc/mysql/YColumns.hxx +++ b/connectivity/source/inc/mysql/YColumns.hxx @@ -32,7 +32,7 @@ namespace connectivity public: OMySQLColumns( ::cppu::OWeakObject& _rParent ,::osl::Mutex& _rMutex - ,const TStringVector &_rVector + ,const ::std::vector< OUString> &_rVector ); }; diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx index a692b03ea8f6..ce3a71a4a971 100644 --- a/connectivity/source/inc/mysql/YTable.hxx +++ b/connectivity/source/inc/mysql/YTable.hxx @@ -47,19 +47,19 @@ namespace connectivity @param _rNames The column names. */ - virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames) override; + virtual sdbcx::OCollection* createColumns(const ::std::vector< OUString>& _rNames) override; /** creates the key collection for the table @param _rNames The key names. */ - virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames) override; + virtual sdbcx::OCollection* createKeys(const ::std::vector< OUString>& _rNames) override; /** creates the index collection for the table @param _rNames The index names. */ - virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames) override; + virtual sdbcx::OCollection* createIndexes(const ::std::vector< OUString>& _rNames) override; /** Returns always "RENAME TABLE " even for views. * diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index 1b0780e3f308..ba8af5d20cc2 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.hxx @@ -41,7 +41,7 @@ namespace connectivity virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject) override; public: OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xMetaData(_rMetaData) {} diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx index ede63b853508..69695ca642b6 100644 --- a/connectivity/source/inc/mysql/YUsers.hxx +++ b/connectivity/source/inc/mysql/YUsers.hxx @@ -43,7 +43,7 @@ namespace connectivity public: OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, const css::uno::Reference< css::sdbc::XConnection >& _xConnection, connectivity::sdbcx::IRefreshableUsers* _pParent); }; diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx index c9914bfe05be..05c47edcbc1b 100644 --- a/connectivity/source/inc/mysql/YViews.hxx +++ b/connectivity/source/inc/mysql/YViews.hxx @@ -38,7 +38,7 @@ namespace connectivity void createView( const css::uno::Reference< css::beans::XPropertySet >& descriptor ); public: OViews(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) + const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) ,m_xMetaData(_rMetaData) ,m_bInDrop(false) {} diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index 06909ab54dba..64d548a76b94 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -38,7 +38,6 @@ #include #include #include -#include #include namespace connectivity @@ -64,10 +63,10 @@ namespace connectivity { std::vector< sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time - std::map + std::map > m_aValueRange; - std::map m_aODBCColumnTypes; + std::map m_aODBCColumnTypes; SQLHANDLE m_aStatementHandle; // ... until freed css::uno::WeakReferenceHelper m_aStatement; diff --git a/connectivity/source/inc/writer/WTables.hxx b/connectivity/source/inc/writer/WTables.hxx index b4eb788d66ca..3112623e5046 100644 --- a/connectivity/source/inc/writer/WTables.hxx +++ b/connectivity/source/inc/writer/WTables.hxx @@ -34,7 +34,7 @@ protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; public: OWriterTables(const css::uno::Reference& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const TStringVector& _rVector) : OWriterTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) + const ::std::vector< OUString>& _rVector) : OWriterTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) {} }; } diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index 5b45cd0bc4a7..193d18613f66 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -197,7 +197,7 @@ OUString OCatalog::buildName(const Reference< XRow >& _xRow) return sComposedName; } -void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rNames) +void OCatalog::fillNames(Reference< XResultSet >& _xResult,::std::vector< OUString>& _rNames) { if ( _xResult.is() ) { diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 339504a95d61..8e2c72ece63c 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -102,12 +102,12 @@ namespace m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), ObjectEntry(_sName,_xObject))); } - virtual void reFill(const TStringVector &_rVector) override + virtual void reFill(const ::std::vector< OUString> &_rVector) override { OSL_ENSURE(!m_aNameMap.size(),"OCollection::reFill: collection isn't empty"); m_aElements.reserve(_rVector.size()); - for(TStringVector::const_iterator i=_rVector.begin(); i != _rVector.end();++i) + for(::std::vector< OUString>::const_iterator i=_rVector.begin(); i != _rVector.end();++i) m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), ObjectEntry(*i,ObjectType()))); } @@ -217,7 +217,7 @@ IMPLEMENT_SERVICE_INFO(OCollection,"com.sun.star.sdbcx.VContainer" , "com.sun.st OCollection::OCollection(::cppu::OWeakObject& _rParent , bool _bCase , ::osl::Mutex& _rMutex - , const TStringVector &_rVector + , const ::std::vector< OUString> &_rVector , bool _bUseIndexOnly , bool _bUseHardRef) :m_aContainerListeners(_rMutex) @@ -335,7 +335,7 @@ void SAL_CALL OCollection::refresh( ) m_aRefreshListeners.notifyEach( &XRefreshListener::refreshed, aEvt ); } -void OCollection::reFill(const TStringVector &_rVector) +void OCollection::reFill(const ::std::vector< OUString> &_rVector) { m_pElements->reFill(_rVector); } -- cgit