diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-02 10:57:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-02 13:06:37 +0000 |
| commit | b1f8cf37828d5f37527e54774aa4935610aa6325 (patch) | |
| tree | 33348c0208f76237f1b08823923f22f99d78b256 /mysqlc | |
| parent | c3a3b876a3a2a739b266622f51a00016a81b0cdf (diff) | |
loplugin:singlevalfields
Change-Id: I65f96d9cd24572c8d0946acf4d2d45eb3db83a76
Reviewed-on: https://gerrit.libreoffice.org/30476
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/source/mysqlc_connection.cxx | 1 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_connection.hxx | 3 | ||||
| -rw-r--r-- | mysqlc/source/mysqlc_databasemetadata.cxx | 9 |
3 files changed, 3 insertions, 10 deletions
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 4afced00bf56..04fff735c627 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -67,7 +67,6 @@ OConnection::OConnection(MysqlCDriver& _rDriver, sql::Driver * _cppDriver) ,m_rDriver(_rDriver) ,cppDriver(_cppDriver) ,m_bClosed(false) - ,m_bUseCatalog(false) { OSL_TRACE("OConnection::OConnection"); m_rDriver.acquire(); diff --git a/mysqlc/source/mysqlc_connection.hxx b/mysqlc/source/mysqlc_connection.hxx index 50ac3c5ac15d..5f1a6a33beed 100644 --- a/mysqlc/source/mysqlc_connection.hxx +++ b/mysqlc/source/mysqlc_connection.hxx @@ -108,7 +108,6 @@ namespace connectivity sql::Driver* cppDriver; bool m_bClosed; - bool m_bUseCatalog; // should we use the catalog on filebased databases public: sal_Int32 getMysqlVersion() @@ -209,8 +208,6 @@ namespace connectivity inline const ConnectionSettings& getConnectionSettings() const { return m_settings; } rtl::OUString transFormPreparedStatement(const rtl::OUString& _sSQL); - // should we use the catalog on filebased databases - inline bool isCatalogUsed() const { return m_bUseCatalog; } inline const MysqlCDriver& getDriver() const { return m_rDriver;} }; /* OConnection */ diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 85cffebf2050..f3b2029d656f 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -83,12 +83,9 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection& _rCon) ,identifier_quote_string_set(false) { OSL_TRACE("ODatabaseMetaData::ODatabaseMetaData"); - if (!m_rConnection.isCatalogUsed()) - { - osl_atomic_increment(&m_refCount); - m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); - osl_atomic_decrement(&m_refCount); - } + osl_atomic_increment(&m_refCount); + m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); + osl_atomic_decrement(&m_refCount); } ODatabaseMetaData::~ODatabaseMetaData() |