diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 17:35:53 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-08 08:13:44 +0100 |
| commit | 44d5188b2fd8afc82aa8fda1ad4b374734129aea (patch) | |
| tree | 07fae7bdc2d87332370d064f9fc81b693a477215 /connectivity | |
| parent | 5eba05a0582cbb836c3715089e5d3bfe1ee19ded (diff) | |
loplugin:unusedfields
Change-Id: Id332557cbe7fb42d3d794612f26aa3ac161548d9
Reviewed-on: https://gerrit.libreoffice.org/50902
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/firebird/Connection.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/firebird/Connection.hxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/firebird/Driver.cxx | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 3c4ba3522020..528a0bd29559 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -81,9 +81,8 @@ static const OUStringLiteral our_sFDBLocation( "firebird.fdb" ); */ static const OUStringLiteral our_sFBKLocation( "firebird.fbk" ); -Connection::Connection(FirebirdDriver* _pDriver) +Connection::Connection() : Connection_BASE(m_aMutex) - , m_xDriver(_pDriver) , m_sConnectionURL() , m_sFirebirdURL() , m_bIsEmbedded(false) @@ -923,7 +922,6 @@ void Connection::disposing() // TODO: write to storage again? cppu::WeakComponentImplHelperBase::disposing(); - m_xDriver.clear(); if (m_pDatabaseFileDir) { diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 8f84b3f00113..6992a5dedd1f 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -73,8 +73,6 @@ namespace connectivity TTypeInfoVector m_aTypeInfo; // vector containing an entry // for each row returned by // DatabaseMetaData.getTypeInfo. - /** The parent driver that created this connection. */ - ::rtl::Reference<FirebirdDriver> m_xDriver; /** The URL passed to us when opening, i.e. of the form sdbc:* */ ::rtl::OUString m_sConnectionURL; @@ -166,7 +164,7 @@ namespace connectivity void disposeStatements(); public: - explicit Connection(FirebirdDriver* _pDriver); + explicit Connection(); virtual ~Connection() override; /// @throws css::sdbc::SQLException diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 398435163b6e..09057309186c 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -183,7 +183,7 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect( if ( ! acceptsURL(url) ) return nullptr; - Connection* pCon = new Connection(this); + Connection* pCon = new Connection(); Reference< XConnection > xCon = pCon; pCon->construct(url, info); |