[Libreoffice-commits] core.git: dbaccess/source

[Noel Grandin (via logerrit)]

 dbaccess/source/core/api/KeySet.cxx        |    2 --
 dbaccess/source/core/api/KeySet.hxx        |    2 --
 dbaccess/source/core/api/OptimisticSet.cxx |    2 +-
 dbaccess/source/core/api/RowSetCache.cxx   |    2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 897be475c155cfd772cc4a252e6073cd6aa43597
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Apr 27 11:00:08 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Apr 27 21:30:45 2020 +0200

    loplugin:unusedfields
    
    Change-Id: I47034909e6258fc4d65d39f484d71290f793107d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92967
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index d9342b15b18b..c9f9ac8a3e22 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -103,7 +103,6 @@ namespace
 
 
 OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
-                 const Reference< XIndexAccess>& _xTableKeys,
                  const OUString& _rUpdateTableName,    // this can be the alias or the full qualified name
                  const Reference< XSingleSelectQueryAnalyzer >& _xComposer,
                  const ORowSetValueVector& _aParameterValueForCache,
@@ -112,7 +111,6 @@ OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
             :OCacheSet(i_nMaxRows)
             ,m_aParameterValueForCache(new ORowSetValueVector(_aParameterValueForCache))
             ,m_xTable(_xTable)
-            ,m_xTableKeys(_xTableKeys)
             ,m_xComposer(_xComposer)
             ,m_sUpdateTableName(_rUpdateTableName)
             ,m_rRowCount(o_nRowCount)
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 92ed794429ab..417774cae70f 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -87,7 +87,6 @@ namespace dbaccess
         std::unique_ptr<SelectColumnsMetaData>                m_pParameterNames;      // contains all parameter names
         std::unique_ptr<SelectColumnsMetaData>                m_pForeignColumnNames;  // contains all column names of the rest
         connectivity::OSQLTable                                 m_xTable; // reference to our table
-        css::uno::Reference< css::container::XIndexAccess>      m_xTableKeys;
         // we need a different SQL (statement) for each different combination
         // of NULLness of key & foreign columns;
         // each subclause is either "colName = ?" or "colName IS NULL"
@@ -145,7 +144,6 @@ namespace dbaccess
         virtual ~OKeySet() override;
     public:
         OKeySet(const connectivity::OSQLTable& _xTable,
-                const css::uno::Reference< css::container::XIndexAccess>& _xTableKeys,
                 const OUString& _rUpdateTableName,
                 const css::uno::Reference< css::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
                 const ORowSetValueVector& _aParameterValueForCache,
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 3b5ea1367512..734e58edf34e 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -76,7 +76,7 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext,
                              const ORowSetValueVector& _aParameterValueForCache,
                              sal_Int32 i_nMaxRows,
                              sal_Int32& o_nRowCount)
-            :OKeySet(nullptr,nullptr,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount)
+            :OKeySet(nullptr,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount)
             ,m_aSqlParser( _rContext )
             ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY_THROW)->getTables(), m_aSqlParser )
             ,m_bResultSetChanged(false)
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 63cc6318aafc..e683a74e9c7a 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -303,7 +303,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
                 }
             }
 
-            OKeySet* pKeySet = new OKeySet(m_aUpdateTable,xUpdateTableKeys,aUpdateTableName ,_xAnalyzer,_aParameterValueForCache,i_nMaxRows,m_nRowCount);
+            OKeySet* pKeySet = new OKeySet(m_aUpdateTable, aUpdateTableName ,_xAnalyzer,_aParameterValueForCache,i_nMaxRows,m_nRowCount);
             try
             {
                 m_xCacheSet = pKeySet;