Tag: cws_src680_dba30 User: fs Date: 2006/07/20 01:56:12 Modified: dba/dbaccess/source/core/api/KeySet.cxx
Log: #i10000# 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.16.4&r2=1.59.16.5 Delta lines: +7 -9 ------------------- --- KeySet.cxx 19 Jul 2006 12:08:29 -0000 1.59.16.4 +++ KeySet.cxx 20 Jul 2006 08:56:09 -0000 1.59.16.5 @@ -4,9 +4,9 @@ * * $RCSfile: KeySet.cxx,v $ * - * $Revision: 1.59.16.4 $ + * $Revision: 1.59.16.5 $ * - * last change: $Author: fs $ $Date: 2006/07/19 12:08:29 $ + * last change: $Author: fs $ $Date: 2006/07/20 08:56:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -157,12 +157,10 @@ const Reference< XSingleSelectQueryAnalyzer >& _xComposer) :m_pKeyColumnNames(NULL) ,m_pColumnNames(NULL) + ,m_pForeignColumnNames(NULL) ,m_xTable(_xTable) ,m_xComposer(_xComposer) ,m_sUpdateTableName(_rUpdateTableName) - ,m_pKeyColumnNames(NULL) - ,m_pColumnNames(NULL) - ,m_pForeignColumnNames(NULL) ,m_bRowCountFinal(sal_False) { DBG_CTOR(OKeySet,NULL); @@ -275,7 +273,7 @@ { Reference<XNameAccess > xSelectColumns = xSup->getColumns(); Reference<XPropertySet> xProp(xSup,uno::UNO_QUERY); - ::rtl::OUString sSelectTableName = ::dbtools::composeTableName(xMetaData,xProp,sal_False,::dbtools::eInDataManipulation); + ::rtl::OUString sSelectTableName = ::dbtools::composeTableName( xMetaData, xProp, ::dbtools::eInDataManipulation, false, false, false ); ::dbaccess::getColumnPositions(xSelectColumns,xSelColSup->getColumns(),sSelectTableName,(*m_pForeignColumnNames)); uno::Sequence< ::rtl::OUString> aSeq = xSelectColumns->getElementNames(); @@ -1106,8 +1104,8 @@ aPosIter = (*m_pForeignColumnNames).begin(); for(;aPosIter != (*m_pForeignColumnNames).end();++aPosIter,++aIter) { - const TPositionTypePair& rPair = aPosIter->second; - aIter->fill(rPair.first,rPair.second.first,m_xDriverRow); + const SelectColumnDescription& rColDesc = aPosIter->second; + aIter->fill(rColDesc.nPosition,rColDesc.nType,m_xDriverRow); } m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(m_aKeyMap.rbegin()->first+1,OKeySetValue(aKeyRow,0))).first; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
