Kaydet (Commit) 1bd2f9c4 authored tarafından Caolán McNamara's avatar Caolán McNamara

m_pEvaluationKeySet is always NULL

Change-Id: Ibe24fc199753dd7a840d57532a20d901c216b910
üst d762ab5b
...@@ -60,7 +60,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) ...@@ -60,7 +60,6 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
,m_pConnection(_pConnection) ,m_pConnection(_pConnection)
,m_pParseTree(NULL) ,m_pParseTree(NULL)
,m_pSQLAnalyzer(NULL) ,m_pSQLAnalyzer(NULL)
,m_pEvaluationKeySet(NULL)
,m_pTable(NULL) ,m_pTable(NULL)
,m_nMaxFieldSize(0) ,m_nMaxFieldSize(0)
,m_nMaxRows(0) ,m_nMaxRows(0)
...@@ -308,7 +307,6 @@ void SAL_CALL OStatement_Base::disposing() ...@@ -308,7 +307,6 @@ void SAL_CALL OStatement_Base::disposing()
m_aEvaluateRow->get().clear(); m_aEvaluateRow->get().clear();
m_aEvaluateRow = NULL; m_aEvaluateRow = NULL;
} }
delete m_pEvaluationKeySet;
OStatement_BASE::disposing(); OStatement_BASE::disposing();
} }
...@@ -495,8 +493,8 @@ void OStatement_Base::initializeResultSet(OResultSet* _pResult) ...@@ -495,8 +493,8 @@ void OStatement_Base::initializeResultSet(OResultSet* _pResult)
_pResult->setSelectRow(m_aSelectRow); _pResult->setSelectRow(m_aSelectRow);
m_pSQLAnalyzer->bindSelectRow(m_aRow); m_pSQLAnalyzer->bindSelectRow(m_aRow);
m_pEvaluationKeySet = m_pSQLAnalyzer->bindEvaluationRow(m_aEvaluateRow); // Set values in the code of the Compiler m_pSQLAnalyzer->bindEvaluationRow(m_aEvaluateRow); // Set values in the code of the Compiler
_pResult->setEvaluationKeySet(m_pEvaluationKeySet); _pResult->setEvaluationKeySet(NULL);
} }
void OStatement_Base::GetAssignValues() void OStatement_Base::GetAssignValues()
......
...@@ -139,11 +139,9 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow) ...@@ -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); bindRow(m_aCompiler->m_aCodeList,_pRow);
return NULL;
} }
OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos, OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
......
...@@ -80,8 +80,6 @@ namespace connectivity ...@@ -80,8 +80,6 @@ namespace connectivity
connectivity::OSQLParseNode* m_pParseTree; connectivity::OSQLParseNode* m_pParseTree;
OSQLAnalyzer* m_pSQLAnalyzer; //the sql analyzer used by the resultset OSQLAnalyzer* m_pSQLAnalyzer; //the sql analyzer used by the resultset
::std::vector<sal_Int32>* m_pEvaluationKeySet;
OFileTable* m_pTable; // the current table OFileTable* m_pTable; // the current table
OValueRefRow m_aSelectRow; OValueRefRow m_aSelectRow;
OValueRefRow m_aRow; OValueRefRow m_aRow;
......
...@@ -56,7 +56,7 @@ namespace connectivity ...@@ -56,7 +56,7 @@ namespace connectivity
{ } { }
OConnection* getConnection() const { return m_pConnection; } 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 /** bind the select columns if they contain a function which needs a row value
@param _pRow the result row @param _pRow the result row
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment