Tag: cws_src680_warnings01 User: sb Date: 06/05/23 16:42:02 Modified: /dba/dbaccess/source/core/api/ KeySet.cxx
Log: RESYNC: (1.59-1.60); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: KeySet.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/KeySet.cxx?r1=1.59.74.1&r2=1.59.74.2 Delta lines: +17 -12 --------------------- --- KeySet.cxx 24 Mar 2006 15:35:45 -0000 1.59.74.1 +++ KeySet.cxx 23 May 2006 23:41:59 -0000 1.59.74.2 @@ -532,10 +532,7 @@ m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32((*_rInsertRow)[0].getAny())); OSL_ENSURE(m_aKeyIter != m_aKeyMap.end(),"New inserted row not found!"); m_aKeyIter->second.second = 2; - connectivity::ORowVector< ORowSetValue >::iterator copyIter = m_aKeyIter->second.first->begin(); - OColumnNamePos::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); - for(;aPosIter != (*m_pKeyColumnNames).end();++aPosIter,++copyIter) - *copyIter = (*_rInsertRow)[aPosIter->second.first]; + copyRowValue(_rInsertRow,m_aKeyIter->second.first); } } // ------------------------------------------------------------------------- @@ -692,11 +689,7 @@ if ( m_bInserted ) { ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >((*m_pKeyColumnNames).size()); - connectivity::ORowVector< ORowSetValue >::iterator copyIter = aKeyRow->begin(); - OColumnNamePos::const_iterator keyIter = (*m_pKeyColumnNames).begin(); - for(;keyIter != (*m_pKeyColumnNames).end();++keyIter,++copyIter) - *copyIter = (*_rInsertRow)[keyIter->second.first]; - + copyRowValue(_rInsertRow,aKeyRow); OKeySetMatrix::iterator aKeyIter = m_aKeyMap.end(); --aKeyIter; @@ -704,6 +697,18 @@ // now we set the bookmark for this row (*_rInsertRow)[0] = makeAny((sal_Int32)m_aKeyIter->first); } +} +// ----------------------------------------------------------------------------- +void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow) +{ + connectivity::ORowVector< ORowSetValue >::iterator aIter = _rKeyRow->begin(); + OColumnNamePos::const_iterator aPosIter = (*m_pKeyColumnNames).begin(); + OColumnNamePos::const_iterator aPosEnd = (*m_pKeyColumnNames).end(); + for(;aPosIter != aPosEnd;++aPosIter,++aIter) + { + *aIter = (*_rInsertRow)[aPosIter->second.first]; + aIter->setTypeKind(aPosIter->second.second.first); + } } // ------------------------------------------------------------------------- void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
