diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-19 11:00:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-20 07:09:43 +0100 |
| commit | 16a3594e6a3bcb5a247a526d199db899a438ad50 (patch) | |
| tree | c0346be15aa217ee71640eb25c53555040a90a48 /dbaccess | |
| parent | 4b3092b6020c7bf7d28e467ea876b627074580b5 (diff) | |
inline typedefs in connectivity/StdTypeDefs
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>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/core/api/FilteredContainer.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/core/api/table.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/core/inc/table.hxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index b9d734e4c242..09e5089ccaee 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -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 diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 9161db77abfa..5ea0353b7e06 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -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); } diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index a1b384f2c4c3..28ae2b42470e 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -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; |