summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-05-18 12:38:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-05-19 09:17:06 +0200
commitfd00bd0f69676659bb43bcc85d8ad5fd21e5de4c (patch)
treef9d62fef7f508f430efd72c85b0d0cf6a67da3be /connectivity
parent8a01fc2f505acc6ed9af5ba18049131225baad30 (diff)
loplugin:unusedfields
make it a little smarter in dealing with fields that are smart pointers Change-Id: I44072105170882dc29fb19558f1065cffc7e5f11 Reviewed-on: https://gerrit.libreoffice.org/37751 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/file/FTables.cxx6
-rw-r--r--connectivity/source/drivers/jdbc/ResultSet.cxx1
-rw-r--r--connectivity/source/inc/file/FTables.hxx6
-rw-r--r--connectivity/source/inc/java/sql/ResultSet.hxx1
4 files changed, 0 insertions, 14 deletions
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index 4858817601d9..2722a1387ce9 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -45,12 +45,6 @@ void OTables::impl_refresh( )
static_cast<OFileCatalog&>(m_rParent).refreshTables();
}
-void OTables::disposing()
-{
-m_xMetaData.clear();
- OCollection::disposing();
-}
-
Any SAL_CALL OTables::queryInterface( const Type & rType )
{
if( rType == cppu::UnoType<XColumnLocate>::get()||
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 5c6ba79e0e00..61703d6edcce 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -101,7 +101,6 @@ void java_sql_ResultSet::disposing()
OPropertySetHelper::disposing();
::osl::MutexGuard aGuard(m_aMutex);
-m_xMetaData.clear();
if( object )
{
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java enviroment has been deleted!");
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index d3e620ff2bfe..c8380134b4ff 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -32,20 +32,14 @@ namespace connectivity
public sdbcx::OCollection
{
protected:
- css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData;
-
virtual sdbcx::ObjectType createObject(const OUString& _rName) override;
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)
- ,m_xMetaData(_rMetaData)
{}
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-
- // only the name is identical to ::cppu::OComponentHelper
- virtual void SAL_CALL disposing() override;
};
}
}
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 218d47c01a70..346f13262332 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
@@ -61,7 +61,6 @@ namespace connectivity
public ::comphelper::OPropertyArrayUsageHelper<java_sql_ResultSet>
{
css::uno::Reference< css::uno::XInterface> m_xStatement;
- css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData;
java::sql::ConnectionLog m_aLogger;
java_sql_Connection* m_pConnection;