Tag: cws_src680_oj14 User: oj Date: 06/03/20 06:04:52 Modified: /dba/dbaccess/source/ui/querydesign/ SelectionBrowseBox.cxx
Log: RESYNC: (1.65-1.66); FILE MERGED 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.63.4.3&r2=1.63.4.4 Delta lines: +18 -15 --------------------- --- SelectionBrowseBox.cxx 20 Mar 2006 07:48:54 -0000 1.63.4.3 +++ SelectionBrowseBox.cxx 20 Mar 2006 14:04:50 -0000 1.63.4.4 @@ -362,7 +362,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); @@ -375,6 +377,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]
