User: rt Date: 06/05/04 01:44:57 Modified: /dba/dbaccess/source/ui/misc/ WColumnSelect.cxx
Log: INTEGRATION: CWS dba203c (1.17.48); FILE MERGED 2006/04/24 13:45:30 oj 1.17.48.2: RESYNC: (1.17-1.18); FILE MERGED 2006/04/13 13:55:20 oj 1.17.48.1: #i62797# format regconition corrected File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: WColumnSelect.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WColumnSelect.cxx?r1=1.18&r2=1.19 Delta lines: +8 -2 ------------------- --- WColumnSelect.cxx 19 Apr 2006 13:23:36 -0000 1.18 +++ WColumnSelect.cxx 4 May 2006 08:44:54 -0000 1.19 @@ -176,7 +176,10 @@ const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); ODatabaseExport::TColumnVector::const_iterator aIter = pDestColumns->begin(); - for(;aIter != pDestColumns->end();++aIter) + ODatabaseExport::TColumnVector::const_iterator aEnd = pDestColumns->end(); + /*if ( m_pParent->isAutoincrementEnabled() && pDestColumns->size() > 1 ) + ++aIter;*/ + for(;aIter != aEnd;++aIter) { USHORT nPos = m_lbNewColumnNames.InsertEntry((*aIter)->first); m_lbNewColumnNames.SetEntryData(nPos,new OFieldDescription(*((*aIter)->second))); @@ -373,7 +376,9 @@ ::std::select2nd<OCopyTableWizard::TNameMapping::value_type>()) ); - DBG_ASSERT(aIter != m_pParent->m_mNameMapping.end(),"Column must to be defined"); + DBG_ASSERT(aIter != m_pParent->m_mNameMapping.end(),"Column must be defined"); + if ( aIter == m_pParent->m_mNameMapping.end() ) + return; // do nothing const ODatabaseExport::TColumns* pSrcColumns = m_pParent->getSourceColumns(); ODatabaseExport::TColumns::const_iterator aSrcIter = pSrcColumns->find((*aIter).first); if ( aSrcIter != pSrcColumns->end() ) @@ -383,6 +388,7 @@ ODatabaseExport::TColumnVector::const_iterator aPos = ::std::find(pSrcVector->begin(),pSrcVector->end(),aSrcIter); OSL_ENSURE( aPos != pSrcVector->end(),"Invalid position for the iterator here!"); USHORT nPos = (aPos - pSrcVector->begin()) - adjustColumnPosition(_pLeft, _sColumnName, (aPos - pSrcVector->begin()), _aCase); + m_pParent->removeColumnNameFromNameMap(_sColumnName); _pRight->SetEntryData( _pRight->InsertEntry( (*aIter).first, nPos),aSrcIter->second ); _rRightColumns.push_back((*aIter).first); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
