User: rt Date: 2008-01-30 07:52:38+0000 Modified: dba/connectivity/source/drivers/file/FResultSet.cxx
Log: INTEGRATION: CWS dba24d (1.98.20); FILE MERGED 2007/11/27 08:08:40 oj 1.98.20.1: #i57380# check correct select values File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FResultSet.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FResultSet.cxx?r1=1.99&r2=1.100 Delta lines: +7 -5 ------------------- --- FResultSet.cxx 2008-01-29 16:54:52+0000 1.99 +++ FResultSet.cxx 2008-01-30 07:52:36+0000 1.100 @@ -1467,11 +1467,12 @@ if(!nWasAllwaysFound[j] && nPos) // nur falls noch nicht nach dieser Row gesucht wurde { ExecuteRow(IResultSetHelper::BOOKMARK,nPos,FALSE); + m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); { // copy row values - OValueRefVector::iterator copyFrom = m_aRow->begin(); + OValueRefVector::iterator copyFrom = m_aSelectRow->begin(); OValueVector::iterator copyTo = aSearchRow->begin(); for ( ++copyFrom,++copyTo; // the first column is the bookmark column - copyFrom != m_aRow->end(); + copyFrom != m_aSelectRow->end(); ++copyFrom,++copyTo) *copyTo = *(*copyFrom); // *aSearchRow = *m_aRow; @@ -1486,16 +1487,17 @@ ExecuteRow(IResultSetHelper::BOOKMARK,nKey,FALSE); if(!nWasAllwaysFound[i]) { - OValueRefVector::iterator loopInRow = m_aRow->begin(); + m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); + OValueRefVector::iterator loopInRow = m_aSelectRow->begin(); OValueVector::iterator existentInSearchRow = aSearchRow->begin(); for ( ++loopInRow,++existentInSearchRow; // the first column is the bookmark column - loopInRow != m_aRow->end(); + loopInRow != m_aSelectRow->end(); ++loopInRow,++existentInSearchRow) { if ( (*loopInRow)->isBound() && !( *(*loopInRow) == *existentInSearchRow) ) break; } - if(loopInRow == m_aRow->end()) + if(loopInRow == m_aSelectRow->end()) { // gefunden // Key an der Stelle 0 setzen. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
