mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inline typedefs in connectivity/StdTypeDefs

Browse Source 
Change-Id: I614833ed2418ff99057c7d496ddb64f06e8395db
Reviewed-on: https://gerrit.libreoffice.org/46809
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2017-12-19 11:00:13 +02:00
parent 4b3092b602
commit 16a3594e6a
104 changed files with 159 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
connectivity/inc/pch/precompiled_mysql.hxx
View File

@ -161,7 +161,6 @@
#include <uno/data.h>
#include <uno/sequence2.h>
#include <connectivity/CommonTools.hxx>
#include <connectivity/StdTypeDefs.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbtoolsdllapi.hxx>

2
connectivity/source/commontools/TColumnsHelper.cxx
View File

@ -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)

2
connectivity/source/commontools/TKeys.cxx
View File

@ -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)
{

16
connectivity/source/commontools/TSkipDeletedSet.cxx
View File

@ -226,7 +226,6 @@ bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool _bRetrieveData)
void OSkipDeletedSet::clear()
{
std::vector<sal_Int32>().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<sal_Int32>::const_iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos);
if ( aFind != m_aBookmarksPositions.end() )
return (aFind - m_aBookmarksPositions.begin()) + 1;
/*TInt2IntMap::const_iterator aFind = m_aBookmarks.find(_nPos);
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<sal_Int32>::iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark);
if ( aFind != m_aBookmarksPositions.end() )
{
//TInt2IntMap::iterator aFind = m_aBookmarks.find(_nPos);
//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);
}
}

12
connectivity/source/commontools/TTableHelper.cxx
View File

@ -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

8
connectivity/source/drivers/ado/ACatalog.cxx
View File

@ -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);

18
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
View File

@ -789,7 +789,7 @@ void ODatabaseMetaDataResultSet::setProceduresMap()
m_aColMapping.push_back(6);
m_aColMapping.push_back(4);
TInt2IntMap aMap;
::std::map<sal_Int32,sal_Int32> 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<sal_Int32,sal_Int32> 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<sal_Int32,sal_Int32> 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<sal_Int32,sal_Int32> 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<sal_Int32,sal_Int32> 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<sal_Int32,sal_Int32> 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<sal_Int32,sal_Int32> 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<sal_Int32,sal_Int32> 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<sal_Int32,sal_Int32> aCurrencyMapping;
m_aValueRange[11] = aCurrencyMapping;
ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);

2
connectivity/source/drivers/ado/AGroup.cxx
View File

@ -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);

2
connectivity/source/drivers/ado/AIndex.cxx
View File

@ -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() )

2
connectivity/source/drivers/ado/AKey.cxx
View File

@ -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() )

6
connectivity/source/drivers/ado/ATable.cxx
View File

@ -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())

2
connectivity/source/drivers/ado/AUser.cxx
View File

@ -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)

2
connectivity/source/drivers/calc/CCatalog.cxx
View File

@ -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<OCalcConnection*>(m_pConnection));
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),

2
connectivity/source/drivers/component/CTable.cxx
View File

@ -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)

2
connectivity/source/drivers/dbase/DCatalog.cxx
View File

@ -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);

2
connectivity/source/drivers/dbase/DIndex.cxx
View File

@ -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!");

4
connectivity/source/drivers/dbase/DTable.cxx
View File

@ -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;

2
connectivity/source/drivers/evoab2/NCatalog.cxx
View File

@ -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);

2
connectivity/source/drivers/evoab2/NColumns.hxx
View File

@ -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)
{ }

2
connectivity/source/drivers/evoab2/NTable.cxx
View File

@ -53,7 +53,7 @@ OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables,
void OEvoabTable::refreshColumns()
{
TStringVector aVector;
::std::vector< OUString> aVector;
if (!isNew())
{

2
connectivity/source/drivers/evoab2/NTables.hxx
View File

@ -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)
{}

2
connectivity/source/drivers/file/FCatalog.cxx
View File

@ -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);

2
connectivity/source/drivers/file/FTable.cxx
View File

@ -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, "%");

4
connectivity/source/drivers/firebird/Catalog.cxx
View File

@ -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())

2
connectivity/source/drivers/firebird/Columns.cxx
View File

@ -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,

2
connectivity/source/drivers/firebird/Columns.hxx
View File

@ -25,7 +25,7 @@ namespace connectivity
public:
Columns(Table& rTable,
::osl::Mutex& rMutex,
const ::connectivity::TStringVector &_rVector);
const ::std::vector< OUString> &_rVector);
};
} // namespace firebird

2
connectivity/source/drivers/firebird/Keys.cxx
View File

@ -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),

2
connectivity/source/drivers/firebird/Keys.hxx
View File

@ -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;

6
connectivity/source/drivers/firebird/Table.cxx
View File

@ -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,

6
connectivity/source/drivers/firebird/Table.hxx
View File

@ -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
/**

2
connectivity/source/drivers/firebird/Tables.hxx
View File

@ -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.

2
connectivity/source/drivers/firebird/Users.cxx
View File

@ -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,

2
connectivity/source/drivers/firebird/Users.hxx
View File

@ -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.

2
connectivity/source/drivers/flat/ECatalog.cxx
View File

@ -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);

2
connectivity/source/drivers/flat/ETable.cxx
View File

@ -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)

8
connectivity/source/drivers/hsqldb/HCatalog.cxx
View File

@ -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() )

2
connectivity/source/drivers/hsqldb/HColumns.cxx
View File

@ -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*/)
{
}

6
connectivity/source/drivers/hsqldb/HTable.cxx
View File

@ -109,19 +109,19 @@ void OHSQLTable::construct()
return *static_cast<OHSQLTable_PROP*>(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);
}

2
connectivity/source/drivers/hsqldb/HUsers.cxx
View File

@ -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)

2
connectivity/source/drivers/hsqldb/HViews.cxx
View File

@ -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() )

2
connectivity/source/drivers/macab/MacabCatalog.cxx
View File

@ -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);

2
connectivity/source/drivers/macab/MacabColumns.cxx
View File

@ -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)
{

2
connectivity/source/drivers/macab/MacabColumns.hxx
View File

@ -38,7 +38,7 @@ namespace connectivity
public:
MacabColumns( MacabTable* _pTable,
::osl::Mutex& _rMutex,
const TStringVector &_rVector);
const ::std::vector< OUString> &_rVector);
};
}
}

2
connectivity/source/drivers/macab/MacabTable.cxx
View File

@ -61,7 +61,7 @@ MacabTable::MacabTable( sdbcx::OCollection* _pTables,
void MacabTable::refreshColumns()
{
TStringVector aVector;
::std::vector< OUString> aVector;
if (!isNew())
{

2
connectivity/source/drivers/macab/MacabTables.hxx
View File

@ -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)
{ }

2
connectivity/source/drivers/mork/MCatalog.cxx
View File

@ -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);

2
connectivity/source/drivers/mork/MColumns.hxx
View File

@ -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)
{}

6
connectivity/source/drivers/mork/MTable.cxx
View File

@ -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 );
}

6
connectivity/source/drivers/mork/MTable.hxx
View File

@ -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;
};

2
connectivity/source/drivers/mork/MTables.hxx
View File

@ -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)
{}

8
connectivity/source/drivers/mysql/YCatalog.cxx
View File

@ -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() )

2
connectivity/source/drivers/mysql/YColumns.cxx
View File

@ -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*/)
{
}

8
connectivity/source/drivers/mysql/YTable.cxx
View File

@ -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<OMySQLTable_PROP*>(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);
}

2
connectivity/source/drivers/mysql/YUsers.cxx
View File

@ -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)

6
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
View File

@ -176,7 +176,7 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get
if ( !m_aValueRange.empty() )
{
std::map<sal_Int32, ::connectivity::TInt2IntMap >::iterator aValueRangeIter (m_aValueRange.find(columnIndex));
auto aValueRangeIter = m_aValueRange.find(columnIndex);
if ( aValueRangeIter != m_aValueRange.end() )
return static_cast<T>(aValueRangeIter->second[nVal]);
}
@ -788,7 +788,7 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nH
void ODatabaseMetaDataResultSet::openTypeInfo()
{
TInt2IntMap aMap;
::std::map<sal_Int32,sal_Int32> 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<SDB_ODBC_CHAR *>(const_cast<char *>(pCOL)), SQL_NTS);
OTools::ThrowException(m_pConnection.get(),nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
TInt2IntMap aMap;
::std::map<sal_Int32,sal_Int32> aMap;
aMap[SQL_BIT] = DataType::BIT;
aMap[SQL_TINYINT] = DataType::TINYINT;
aMap[SQL_SMALLINT] = DataType::SMALLINT;

2
connectivity/source/drivers/writer/WCatalog.cxx
View File

@ -40,7 +40,7 @@ OWriterCatalog::OWriterCatalog(OWriterConnection* pConnection) : file::OFileCata
void OWriterCatalog::refreshTables()
{
TStringVector aVector;
::std::vector< OUString> aVector;
uno::Sequence<OUString> aTypes;
OWriterConnection::ODocHolder aDocHolder(static_cast<OWriterConnection*>(m_pConnection));
uno::Reference< sdbc::XResultSet > xResult = m_xMetaData->getTables(uno::Any(), "%", "%", aTypes);

1
connectivity/source/drivers/writer/WTable.cxx
View File

@ -43,7 +43,6 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbconversion.hxx>
#include <comphelper/types.hxx>
#include <connectivity/StdTypeDefs.hxx>
#include <connectivity/sdbcx/VCollection.hxx>
using namespace ::com::sun::star;

1
connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
View File

@ -25,7 +25,6 @@
#include <vector>
#include "FDatabaseMetaDataResultSet.hxx"
#include "OColumn.hxx"
#include <connectivity/StdTypeDefs.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
namespace connectivity

2
connectivity/source/inc/ado/AColumns.hxx
View File

@ -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)

5
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
View File

@ -33,7 +33,6 @@
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
#include <ado/AStatement.hxx>
#include <connectivity/StdTypeDefs.hxx>
namespace connectivity
{
@ -57,8 +56,8 @@ namespace connectivity
{
std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 every time
std::map<sal_Int32, TInt2IntMap > m_aValueRange;
std::map<sal_Int32, TInt2IntMap >::iterator m_aValueRangeIter;
std::map<sal_Int32, ::std::map<sal_Int32,sal_Int32> > m_aValueRange;
std::map<sal_Int32, ::std::map<sal_Int32,sal_Int32> >::iterator m_aValueRangeIter;
std::map<sal_Int32, std::map< OUString,sal_Int32> > m_aStrValueRange;
std::map<sal_Int32, std::map< OUString,sal_Int32> >::iterator m_aStrValueRangeIter;

2
connectivity/source/inc/ado/AGroups.hxx
View File

@ -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)

2
connectivity/source/inc/ado/AIndexes.hxx
View File

@ -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)

2
connectivity/source/inc/ado/AKeys.hxx
View File

@ -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)

2
connectivity/source/inc/ado/ATables.hxx
View File

@ -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)

2
connectivity/source/inc/ado/AUsers.hxx
View File

@ -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)

2
connectivity/source/inc/ado/AViews.hxx
View File

@ -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)

3
connectivity/source/inc/ado/Aolewrap.hxx
View File

@ -23,7 +23,6 @@
#include <osl/thread.h>
#include <map>
#include <vector>
#include <connectivity/StdTypeDefs.hxx>
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())
{

2
connectivity/source/inc/calc/CTables.hxx
View File

@ -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)
{}
};
}

2
connectivity/source/inc/component/CColumns.hxx
View File

@ -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)
{}

2
connectivity/source/inc/dbase/DColumns.hxx
View File

@ -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)
{}
};

2
connectivity/source/inc/dbase/DIndexColumns.hxx
View File

@ -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)
{}

2
connectivity/source/inc/dbase/DIndexes.hxx
View File

@ -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)
{}

2
connectivity/source/inc/dbase/DTables.hxx
View File

@ -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;

2
connectivity/source/inc/file/FColumns.hxx
View File

@ -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)
{}

1
connectivity/source/inc/file/FResultSet.hxx
View File

@ -38,7 +38,6 @@
#include <file/fanalyzer.hxx>
#include <file/FTable.hxx>
#include <file/filedllapi.hxx>
#include <connectivity/StdTypeDefs.hxx>
#include <TSortIndex.hxx>
#include <TSkipDeletedSet.hxx>
#include <com/sun/star/lang/XEventListener.hpp>

2
connectivity/source/inc/file/FTables.hxx
View File

@ -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;

2
connectivity/source/inc/flat/EColumns.hxx
View File

@ -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)
{}

2
connectivity/source/inc/flat/ETables.hxx
View File

@ -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)
{}
};
}

3
connectivity/source/inc/hsqldb/HCatalog.hxx
View File

@ -20,7 +20,6 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX
#include <connectivity/sdbcx/VCatalog.hxx>
#include <connectivity/StdTypeDefs.hxx>
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

2
connectivity/source/inc/hsqldb/HColumns.hxx
View File

@ -32,7 +32,7 @@ namespace connectivity
public:
OHSQLColumns( ::cppu::OWeakObject& _rParent
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
,const ::std::vector< OUString> &_rVector
);
};

6
connectivity/source/inc/hsqldb/HTable.hxx
View File

@ -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.

2
connectivity/source/inc/hsqldb/HTables.hxx
View File

@ -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)
{}

2
connectivity/source/inc/hsqldb/HUsers.hxx
View File

@ -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);
};

2
connectivity/source/inc/hsqldb/HViews.hxx
View File

@ -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;

3
connectivity/source/inc/mysql/YCatalog.hxx
View File

@ -20,7 +20,6 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YCATALOG_HXX
#include <connectivity/sdbcx/VCatalog.hxx>
#include <connectivity/StdTypeDefs.hxx>
namespace connectivity
{
@ -38,7 +37,7 @@ namespace connectivity
@param _rNames
The container for the names to be filled. <OUT/>
*/
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

2
connectivity/source/inc/mysql/YColumns.hxx
View File

@ -32,7 +32,7 @@ namespace connectivity
public:
OMySQLColumns( ::cppu::OWeakObject& _rParent
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
,const ::std::vector< OUString> &_rVector
);
};

6
connectivity/source/inc/mysql/YTable.hxx
View File

@ -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.
*

2
connectivity/source/inc/mysql/YTables.hxx
View File

@ -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)
{}

2
connectivity/source/inc/mysql/YUsers.hxx
View File

@ -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);
};

2
connectivity/source/inc/mysql/YViews.hxx
View File

@ -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)
{}

5
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
View File

@ -38,7 +38,6 @@
#include <odbc/OStatement.hxx>
#include <odbc/ODatabaseMetaData.hxx>
#include <odbc/odbcbasedllapi.hxx>
#include <connectivity/StdTypeDefs.hxx>
#include <memory>
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<sal_Int32, ::connectivity::TInt2IntMap >
std::map<sal_Int32, ::std::map<sal_Int32,sal_Int32> >
m_aValueRange;
std::map<sal_Int32,SWORD> m_aODBCColumnTypes;
std::map<sal_Int32,SWORD> m_aODBCColumnTypes;
SQLHANDLE m_aStatementHandle; // ... until freed
css::uno::WeakReferenceHelper m_aStatement;

2
connectivity/source/inc/writer/WTables.hxx
View File

@ -34,7 +34,7 @@ protected:
virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
public:
OWriterTables(const css::uno::Reference<css::sdbc::XDatabaseMetaData>& _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)
{}
};
}

2
connectivity/source/sdbcx/VCatalog.cxx
View File

@ -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() )
{

8
connectivity/source/sdbcx/VCollection.cxx
View File

@ -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);
}

4
dbaccess/source/core/api/FilteredContainer.cxx
View File

@ -160,7 +160,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::vector<
_io_tableInfo.sType = OptionalString( sTypeName );
}
connectivity::TStringVector lcl_filter( const TableInfos& _unfilteredTables,
::std::vector< OUString> lcl_filter( const TableInfos& _unfilteredTables,
const Sequence< OUString >& _tableFilter, const Sequence< OUString >& _tableTypeFilter,
const Reference< XDatabaseMetaData >& _metaData, const Reference< XNameAccess >& _masterContainer )
{
@ -222,7 +222,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, std::vector<
}
}
connectivity::TStringVector aReturn;
::std::vector< OUString> aReturn;
for ( TableInfos::iterator table = aFilteredTables.begin();
table != aFilteredTables.end();
++table

6
dbaccess/source/core/api/table.cxx
View File

@ -333,7 +333,7 @@ Reference< XPropertySet > ODBTable::createColumnDescriptor()
return new OTableColumnDescriptor( true );
}
sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames)
sdbcx::OCollection* ODBTable::createColumns(const ::std::vector< OUString>& _rNames)
{
Reference<XDatabaseMetaData> xMeta = getMetaData();
OColumns* pCol = new OColumns(*this, m_aMutex, nullptr, isCaseSensitive(), _rNames, this,this,
@ -346,12 +346,12 @@ sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames)
return pCol;
}
sdbcx::OCollection* ODBTable::createKeys(const TStringVector& _rNames)
sdbcx::OCollection* ODBTable::createKeys(const ::std::vector< OUString>& _rNames)
{
return new connectivity::OKeysHelper(this,m_aMutex,_rNames);
}
sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames)
sdbcx::OCollection* ODBTable::createIndexes(const ::std::vector< OUString>& _rNames)
{
return new OIndexes(this,m_aMutex,_rNames,nullptr);
}

6
dbaccess/source/core/inc/table.hxx
View File

@ -76,19 +76,19 @@ namespace dbaccess
@param _rNames
The column names.
*/
virtual ::connectivity::sdbcx::OCollection* createColumns(const ::connectivity::TStringVector& _rNames) override;
virtual ::connectivity::sdbcx::OCollection* createColumns(const ::std::vector< OUString>& _rNames) override;
/** creates the key collection for the table
@param _rNames
The key names.
*/
virtual ::connectivity::sdbcx::OCollection* createKeys(const ::connectivity::TStringVector& _rNames) override;
virtual ::connectivity::sdbcx::OCollection* createKeys(const ::std::vector< OUString>& _rNames) override;
/** creates the index collection for the table
@param _rNames
The index names.
*/
virtual ::connectivity::sdbcx::OCollection* createIndexes(const ::connectivity::TStringVector& _rNames) override;
virtual ::connectivity::sdbcx::OCollection* createIndexes(const ::std::vector< OUString>& _rNames) override;
// OComponentHelper
virtual void SAL_CALL disposing() override;

36
include/connectivity/StdTypeDefs.hxx
View File

@ -1,36 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
#define INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
#include <map>
#include <vector>
#include <rtl/ustring.hxx>
namespace connectivity
{
typedef ::std::vector< OUString> TStringVector;
typedef ::std::map<sal_Int32,sal_Int32> TInt2IntMap;
}
#endif // INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
include/connectivity/TColumnsHelper.hxx
View File

@ -47,7 +47,7 @@ namespace connectivity
OColumnsHelper( ::cppu::OWeakObject& _rParent
,bool _bCase
,::osl::Mutex& _rMutex
,const TStringVector &_rVector
,const ::std::vector< OUString> &_rVector
,bool _bUseHardRef
);
virtual ~OColumnsHelper() override;

2
include/connectivity/TKeys.hxx
View File

@ -43,7 +43,7 @@ namespace connectivity
public:
OKeysHelper( OTableHelper* _pTable,
::osl::Mutex& _rMutex,
const TStringVector& _rVector
const ::std::vector< OUString>& _rVector
);
static void cloneDescriptorColumns(

Some files were not shown because too many files have changed in this diff Show More