diff options
Diffstat (limited to 'dbaccess/source/ui/misc/WNameMatch.cxx')
| -rw-r--r-- | dbaccess/source/ui/misc/WNameMatch.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 5325f0388cfc..5b50a7e553cd 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -187,9 +187,10 @@ sal_Bool OWizNameMatching::LeavePage() DBG_ASSERT(pSrcField,"OWizNameMatching: OColumn can not be null!"); ODatabaseExport::TColumnVector::const_iterator aSrcIter = pSrcColumns->begin(); - for(;aSrcIter != pSrcColumns->end() && (*aSrcIter)->second != pSrcField;++aSrcIter) + ODatabaseExport::TColumnVector::const_iterator aSrcEnd = pSrcColumns->end(); + for(;aSrcIter != aSrcEnd && (*aSrcIter)->second != pSrcField;++aSrcIter) ; - sal_Int32 nPos = ::std::distance(pSrcColumns->begin(),aSrcIter); + const sal_Int32 nPos = ::std::distance(pSrcColumns->begin(),aSrcIter); // sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pLeftEntry); if(m_CTRL_LEFT.GetCheckButtonState(pLeftEntry) == SV_BUTTON_CHECKED) @@ -198,8 +199,9 @@ sal_Bool OWizNameMatching::LeavePage() DBG_ASSERT(pDestField,"OWizNameMatching: OColumn can not be null!"); const ODatabaseExport::TColumnVector* pDestColumns = m_pParent->getDestVector(); ODatabaseExport::TColumnVector::const_iterator aDestIter = pDestColumns->begin(); + ODatabaseExport::TColumnVector::const_iterator aDestEnd = pDestColumns->end(); - for(;aDestIter != pDestColumns->end() && (*aDestIter)->second != pDestField;++aDestIter) + for(;aDestIter != aDestEnd && (*aDestIter)->second != pDestField;++aDestIter) ; OSL_ENSURE((nPos) < static_cast<sal_Int32>(m_pParent->m_vColumnPos.size()),"m_pParent->m_vColumnPos: Illegal index for vector"); @@ -435,7 +437,8 @@ void OColumnTreeBox::FillListBox( const ODatabaseExport::TColumnVector& _rList) { Clear(); ODatabaseExport::TColumnVector::const_iterator aIter = _rList.begin(); - for(;aIter != _rList.end();++aIter) + ODatabaseExport::TColumnVector::const_iterator aEnd = _rList.end(); + for(;aIter != aEnd;++aIter) { SvLBoxEntry* pEntry = InsertEntry((*aIter)->first,0,sal_False,LIST_APPEND,(*aIter)->second); SvButtonState eState = !(m_bReadOnly && (*aIter)->second->IsAutoIncrement()) ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED; |