User: hr Date: 05/09/23 05:02:14 Modified: /dba/dbaccess/source/core/api/ KeySet.cxx
Log: INTEGRATION: CWS dba201b (1.57.38); FILE MERGED 2005/09/21 06:44:44 oj 1.57.38.2: RESYNC: (1.57-1.58); FILE MERGED 2005/07/11 13:36:58 fs 1.57.38.1: merging CWS dba201 into CWS dba201b 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.58&r2=1.59 Delta lines: +12 -6 -------------------- --- KeySet.cxx 8 Sep 2005 09:58:56 -0000 1.58 +++ KeySet.cxx 23 Sep 2005 12:02:11 -0000 1.59 @@ -107,6 +107,9 @@ #ifndef DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX #include "composertools.hxx" #endif +#ifndef _TOOLS_DEBUG_HXX +#include <tools/debug.hxx> +#endif using namespace dbaccess; using namespace connectivity; @@ -142,6 +145,7 @@ } } } +DBG_NAME(OKeySet) // ------------------------------------------------------------------------- OKeySet::OKeySet(const connectivity::OSQLTable& _xTable, const ::rtl::OUString& _rUpdateTableName, // this can be the alias or the full qualified name @@ -153,6 +157,8 @@ ,m_pKeyColumnNames(NULL) ,m_pColumnNames(NULL) { + DBG_CTOR(OKeySet,NULL); + } // ----------------------------------------------------------------------------- OKeySet::~OKeySet() @@ -172,6 +178,8 @@ m_xComposer = NULL; delete m_pKeyColumnNames; delete m_pColumnNames; + + DBG_DTOR(OKeySet,NULL); } // ----------------------------------------------------------------------------- void OKeySet::construct(const Reference< XResultSet>& _xDriverSet) @@ -618,8 +626,8 @@ ::rtl::OUString sColumnName( xMd->getColumnName(i) ); #endif OColumnNamePos::iterator aFind = m_pKeyColumnNames->find(*aAutoIter); - if(aFind != m_pKeyColumnNames->end()) - fetchValue(i,aFind->second.second.first,xRow,(*_rInsertRow)[aFind->second.first]); + if ( aFind != m_pKeyColumnNames->end() ) + (*_rInsertRow)[aFind->second.first].fill(i,aFind->second.second.first,xRow); } bAutoValuesFetched = sal_True; } @@ -672,7 +680,7 @@ // we will only fetch values which are keycolumns OColumnNamePos::iterator aFind = m_pKeyColumnNames->find(*aAutoIter); if(aFind != m_pKeyColumnNames->end()) - fetchValue(i,aFind->second.second.first,xRow,(*_rInsertRow)[aFind->second.first]); + (*_rInsertRow)[aFind->second.first].fill(i,aFind->second.second.first,xRow); } } ::comphelper::disposeComponent(xStatement); @@ -1037,7 +1045,7 @@ for(;aPosIter != (*m_pKeyColumnNames).end();++aPosIter,++aIter) { const TPositionTypePair& rPair = aPosIter->second; - fetchValue(rPair.first,rPair.second.first,m_xDriverRow,*aIter); + aIter->fill(rPair.first,rPair.second.first,m_xDriverRow); } m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,0))).first; } @@ -1271,5 +1279,3 @@ } } } - - --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
