Tag: cws_src680_dba24a User: oj Date: 2007-09-03 12:51:28+0000 Modified: dba/dbaccess/source/ui/misc/WCPage.cxx
Log: #i73710# check src vector as well File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: WCPage.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WCPage.cxx?r1=1.30.18.2&r2=1.30.18.3 Delta lines: +6 -5 ------------------- --- WCPage.cxx 2007-08-30 08:19:53+0000 1.30.18.2 +++ WCPage.cxx 2007-09-03 12:51:26+0000 1.30.18.3 @@ -4,9 +4,9 @@ * * $RCSfile: WCPage.cxx,v $ * - * $Revision: 1.30.18.2 $ + * $Revision: 1.30.18.3 $ * - * last change: $Author: oj $ $Date: 2007/08/30 08:19:53 $ + * last change: $Author: oj $ $Date: 2007/09/03 12:51:26 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -374,8 +374,9 @@ if(xTables.is() && xTables->hasByName(m_edTableName.GetText())) { const ODatabaseExport::TColumnVector* pSrcColumns = m_pParent->getSrcVector(); - m_pParent->m_vColumnPos.resize( pSrcColumns->size() ,ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) ); - m_pParent->m_vColumnTypes.resize( pSrcColumns->size(), COLUMN_POSITION_NOT_FOUND ); + const sal_uInt32 nSrcSize = pSrcColumns->size(); + m_pParent->m_vColumnPos.resize( nSrcSize ,ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) ); + m_pParent->m_vColumnTypes.resize( nSrcSize , COLUMN_POSITION_NOT_FOUND ); // set new destination xTables->getByName(m_edTableName.GetText()) >>= m_pParent->m_xDestObject; @@ -386,7 +387,7 @@ const sal_uInt32 nDestSize = pDestColumns->size(); sal_Bool bNotConvert; sal_uInt32 i = 0; - for(sal_Int32 nPos = 1;aDestIter != pDestColumns->end() && i < nDestSize;++aDestIter,++nPos,++i) + for(sal_Int32 nPos = 1;aDestIter != pDestColumns->end() && i < nDestSize && i < nSrcSize;++aDestIter,++nPos,++i) { bNotConvert = sal_True; m_pParent->m_vColumnPos[i] = ODatabaseExport::TPositions::value_type(nPos,nPos); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
