Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:13:27 Modified: dba/dbaccess/source/ui/misc/WColumnSelect.cxx
Log: RESYNC: (1.17-1.20); FILE MERGED 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.16.8.4&r2=1.16.8.5 Delta lines: +24 -16 --------------------- --- WColumnSelect.cxx 25 Apr 2006 13:03:17 -0000 1.16.8.4 +++ WColumnSelect.cxx 4 Jul 2006 08:13:24 -0000 1.16.8.5 @@ -100,14 +100,14 @@ DBG_NAME(OWizColumnSelect); //======================================================================== OWizColumnSelect::OWizColumnSelect( Window* pParent) - :OWizardPage( pParent, ModuleRes( TAB_WIZ_COLUMN_SELECT )), - m_flColumns( this, ModuleRes( FL_COLUMN_SELECT ) ), - m_lbOrgColumnNames( this, ModuleRes( LB_ORG_COLUMN_NAMES ) ), - m_ibColumn_RH( this, ModuleRes( IB_COLUMN_RH ) ), - m_ibColumn_LH( this, ModuleRes( IB_COLUMN_LH ) ), - m_ibColumns_RH( this, ModuleRes( IB_COLUMNS_RH ) ), - m_ibColumns_LH( this, ModuleRes( IB_COLUMNS_LH ) ), - m_lbNewColumnNames( this, ModuleRes( LB_NEW_COLUMN_NAMES ) ) + :OWizardPage( pParent, ModuleRes( TAB_WIZ_COLUMN_SELECT )) + ,m_flColumns( this, ModuleRes( FL_COLUMN_SELECT ) ) + ,m_lbOrgColumnNames( this, ModuleRes( LB_ORG_COLUMN_NAMES ) ) + ,m_ibColumn_RH( this, ModuleRes( IB_COLUMN_RH ) ) + ,m_ibColumns_RH( this, ModuleRes( IB_COLUMNS_RH ) ) + ,m_ibColumn_LH( this, ModuleRes( IB_COLUMN_LH ) ) + ,m_ibColumns_LH( this, ModuleRes( IB_COLUMNS_LH ) ) + ,m_lbNewColumnNames( this, ModuleRes( LB_NEW_COLUMN_NAMES ) ) { DBG_CTOR(OWizColumnSelect,NULL); m_ibColumn_RH.SetClickHdl(LINK(this,OWizColumnSelect,ButtonClickHdl)); @@ -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))); @@ -204,7 +207,9 @@ clearListBox(m_lbNewColumnNames); - if(m_pParent->WasButtonPressed() == OCopyTableWizard::WIZARD_NEXT || m_pParent->WasButtonPressed() == OCopyTableWizard::WIZARD_FINISH) + if ( m_pParent->GetPressedButton() == OCopyTableWizard::WIZARD_NEXT + || m_pParent->GetPressedButton() == OCopyTableWizard::WIZARD_FINISH + ) return m_pParent->getDestColumns()->size(); else return sal_True; @@ -329,8 +334,7 @@ const ::rtl::OUString& _sColumnName, const ::rtl::OUString& _sExtraChars, sal_Int32 _nMaxNameLen, - const ::comphelper::TStringMixEqualFunctor& _aCase, - USHORT nPos) + const ::comphelper::TStringMixEqualFunctor& _aCase) { ::rtl::OUString sConvertedName = m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase), _sColumnName, @@ -373,7 +377,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,9 +389,11 @@ 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); + m_pParent->removeColumnNameFromNameMap(_sColumnName); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
