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 /include/connectivity/sdbcx | |
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 'include/connectivity/sdbcx')
-rw-r--r-- | include/connectivity/sdbcx/VCatalog.hxx | 3 | ||||
-rw-r--r-- | include/connectivity/sdbcx/VCollection.hxx | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx index 3f7710e43630..0b6ebc463e8e 100644 --- a/include/connectivity/sdbcx/VCatalog.hxx +++ b/include/connectivity/sdbcx/VCatalog.hxx @@ -32,7 +32,6 @@ #include <connectivity/CommonTools.hxx> #include <connectivity/OSubComponent.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> -#include <connectivity/StdTypeDefs.hxx> #include <connectivity/dbtoolsdllapi.hxx> namespace connectivity @@ -86,7 +85,7 @@ namespace connectivity @param _rNames The vector who will be filled. */ - void fillNames(css::uno::Reference< css::sdbc::XResultSet >& _xResult,TStringVector& _rNames); + void fillNames(css::uno::Reference< css::sdbc::XResultSet >& _xResult,::std::vector< OUString>& _rNames); public: OCatalog(const css::uno::Reference< css::sdbc::XConnection> &_xConnection); diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index ead911083029..9bf5e4c54200 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -36,7 +36,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <connectivity/CommonTools.hxx> #include <com/sun/star/container/XContainer.hpp> -#include <connectivity/StdTypeDefs.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <memory> @@ -69,7 +68,7 @@ namespace connectivity virtual void swapAll() = 0; virtual void swap() = 0; virtual void clear() = 0; - virtual void reFill(const TStringVector &_rVector) = 0; + virtual void reFill(const ::std::vector< OUString> &_rVector) = 0; virtual void insert(const OUString& _sName, const ObjectType& _xObject) = 0; virtual bool rename(const OUString& _sOldName, const OUString& _sNewName) = 0; virtual sal_Int32 size() = 0; @@ -147,7 +146,7 @@ namespace connectivity OCollection(::cppu::OWeakObject& _rParent, bool _bCase, ::osl::Mutex& _rMutex, - const TStringVector &_rVector, + const ::std::vector< OUString> &_rVector, bool _bUseIndexOnly = false, bool _bUseHardRef = true); @@ -171,7 +170,7 @@ namespace connectivity virtual ~OCollection(); DECLARE_SERVICE_INFO(); - void reFill(const TStringVector &_rVector); + void reFill(const ::std::vector< OUString> &_rVector); bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); } void renameObject(const OUString& _sOldName, const OUString& _sNewName); |