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 /connectivity/source/inc | |
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 'connectivity/source/inc')
35 files changed, 39 insertions, 46 deletions
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 <vector> #include "FDatabaseMetaDataResultSet.hxx" #include "OColumn.hxx" -#include <connectivity/StdTypeDefs.hxx> #include <connectivity/dbtoolsdllapi.hxx> 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 <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; 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 <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()) { 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 <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> 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 <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 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 <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 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 <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; 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<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) {} }; } |