User: obo Date: 06/01/16 07:30:27 Modified: /dba/dbaccess/source/ui/querydesign/ SelectionBrowseBox.cxx
Log: INTEGRATION: CWS dba202b (1.64.16); FILE MERGED 2005/12/27 11:28:23 oj 1.64.16.2: RESYNC: (1.64-1.65); FILE MERGED 2005/12/27 10:24:50 oj 1.64.16.1: #129390# check aIter != aEnd File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: SelectionBrowseBox.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx?r1=1.65&r2=1.66 Delta lines: +15 -12 --------------------- --- SelectionBrowseBox.cxx 21 Dec 2005 13:37:05 -0000 1.65 +++ SelectionBrowseBox.cxx 16 Jan 2006 15:30:24 -0000 1.66 @@ -359,7 +359,9 @@ for (; aIter != aEnd && ( (*aIter)->GetColumnId() != nColId ); ++aIter,++nOldPos) ; - OSL_ENSURE( (nNewPos-1) != nOldPos,"Old and new position are equal!"); + OSL_ENSURE( (nNewPos-1) != nOldPos && nOldPos < rFields.size(),"Old and new position are equal!"); + if ( aIter != aEnd ) + { OTableFieldDescRef pOldEntry = rFields[nOldPos]; rFields.erase(rFields.begin() + nOldPos); rFields.insert(rFields.begin() + nNewPos - 1,pOldEntry); @@ -372,6 +374,7 @@ pUndoAct->SetTabFieldDescr(pOldEntry); getDesignView()->getController()->addUndoActionAndInvalidate(pUndoAct); + } // if ( !m_bInUndoMode && _bCreateUndo ) } } else --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
