diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 07:44:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-05-04 07:44:54 +0000 |
| commit | 46d11e8b9809fb3505178eb87589911341ae82d9 (patch) | |
| tree | 250f014882f7d36eeaeb3a0c8ec87d01837e90bb /dbaccess/source/ui/misc/WColumnSelect.cxx | |
| parent | 3f8b1470ecc84830db512e58888d49fc9ff812dc (diff) | |
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
Diffstat (limited to 'dbaccess/source/ui/misc/WColumnSelect.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/WColumnSelect.cxx | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index b058b27c9415..0e5ed7a26636 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -4,9 +4,9 @@ * * $RCSfile: WColumnSelect.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: hr $ $Date: 2006-04-19 13:23:36 $ + * last change: $Author: rt $ $Date: 2006-05-04 08:44:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -176,7 +176,10 @@ void OWizColumnSelect::ActivatePage( ) 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 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, ::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 @@ void OWizColumnSelect::moveColumn( ListBox* _pRight, 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); |