m_pEvaluationKeySet is always NULL

Change-Id: Ibe24fc199753dd7a840d57532a20d901c216b910

4 files changed, 4 insertions, 10 deletions

diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 7833200bf5aa..8aa0e659d751 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -60,7 +60,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
     ,m_pConnection(_pConnection)
     ,m_pParseTree(NULL)
     ,m_pSQLAnalyzer(NULL)
-    ,m_pEvaluationKeySet(NULL)
     ,m_pTable(NULL)
     ,m_nMaxFieldSize(0)
     ,m_nMaxRows(0)
@@ -308,7 +307,6 @@ void SAL_CALL OStatement_Base::disposing()
         m_aEvaluateRow->get().clear();
         m_aEvaluateRow = NULL;
     }
-    delete m_pEvaluationKeySet;
     OStatement_BASE::disposing();
 }
 
@@ -495,8 +493,8 @@ void OStatement_Base::initializeResultSet(OResultSet* _pResult)
     _pResult->setSelectRow(m_aSelectRow);
 
     m_pSQLAnalyzer->bindSelectRow(m_aRow);
-    m_pEvaluationKeySet = m_pSQLAnalyzer->bindEvaluationRow(m_aEvaluateRow);    // Set values in the code of the Compiler
-    _pResult->setEvaluationKeySet(m_pEvaluationKeySet);
+    m_pSQLAnalyzer->bindEvaluationRow(m_aEvaluateRow);    // Set values in the code of the Compiler
+    _pResult->setEvaluationKeySet(NULL);
 }
 
 void OStatement_Base::GetAssignValues()
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 06bf5c4c24bd..16ec78a25f4a 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -139,11 +139,9 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
     }
 }
 
-::std::vector<sal_Int32>* OSQLAnalyzer::bindEvaluationRow(OValueRefRow& _pRow)
+void OSQLAnalyzer::bindEvaluationRow(OValueRefRow& _pRow)
 {
     bindRow(m_aCompiler->m_aCodeList,_pRow);
-
-    return NULL;
 }
 
 OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index 1ee2f09cb3bb..8f5bf903682a 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -80,8 +80,6 @@ namespace connectivity
             connectivity::OSQLParseNode*                m_pParseTree;
             OSQLAnalyzer*                               m_pSQLAnalyzer; //the sql analyzer used by the resultset
 
-            ::std::vector<sal_Int32>*                   m_pEvaluationKeySet;
-
             OFileTable*                                 m_pTable;       // the current table
             OValueRefRow                                m_aSelectRow;
             OValueRefRow                                m_aRow;
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 057ea811c84f..ebcaf0efca38 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -56,7 +56,7 @@ namespace connectivity
                 {  }
 
             OConnection* getConnection() const { return m_pConnection; }
-            ::std::vector<sal_Int32>* bindEvaluationRow(OValueRefRow& _pRow); // Bind an evaluation row to the restriction
+            void bindEvaluationRow(OValueRefRow& _pRow); // Bind an evaluation row to the restriction
             /** bind the select columns if they contain a function which needs a row value
                 @param  _pRow   the result row
             */