User: obo Date: 2006/10/12 06:40:51 Modified: dba/dbaccess/source/ui/misc/WColumnSelect.cxx
Log: INTEGRATION: CWS sb59 (1.20.28); FILE MERGED 2006/08/29 11:44:30 sb 1.20.28.1: #i67487# Made code warning-free (wntmsci10). 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.21&r2=1.22 Delta lines: +5 -5 ------------------- --- WColumnSelect.cxx 17 Sep 2006 07:14:34 -0000 1.21 +++ WColumnSelect.cxx 12 Oct 2006 13:40:49 -0000 1.22 @@ -213,7 +213,7 @@ if ( m_pParent->GetPressedButton() == OCopyTableWizard::WIZARD_NEXT || m_pParent->GetPressedButton() == OCopyTableWizard::WIZARD_FINISH ) - return m_pParent->getDestColumns()->size(); + return m_pParent->getDestColumns()->size() != 0; else return sal_True; } @@ -391,10 +391,10 @@ const ODatabaseExport::TColumnVector* pSrcVector = m_pParent->getSrcVector(); 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); + ODatabaseExport::TColumnVector::size_type nPos = (aPos - pSrcVector->begin()) - adjustColumnPosition(_pLeft, _sColumnName, (aPos - pSrcVector->begin()), _aCase); m_pParent->removeColumnNameFromNameMap(_sColumnName); - _pRight->SetEntryData( _pRight->InsertEntry( (*aIter).first, nPos),aSrcIter->second ); + _pRight->SetEntryData( _pRight->InsertEntry( (*aIter).first, sal::static_int_cast< USHORT >(nPos)),aSrcIter->second ); _rRightColumns.push_back((*aIter).first); m_pParent->removeColumnNameFromNameMap(_sColumnName); } @@ -407,7 +407,7 @@ // algorithm employed in moveColumn(). USHORT OWizColumnSelect::adjustColumnPosition( ListBox* _pLeft, const ::rtl::OUString& _sColumnName, - USHORT nCurrentPos, + ODatabaseExport::TColumnVector::size_type nCurrentPos, const ::comphelper::TStringMixEqualFunctor& _aCase) { USHORT nAdjustedPos = 0; @@ -439,7 +439,7 @@ // we need also the old position of this column to insert it back on that position again const ODatabaseExport::TColumnVector* pSrcVector = m_pParent->getSrcVector(); ODatabaseExport::TColumnVector::const_iterator aPos = ::std::find(pSrcVector->begin(),pSrcVector->end(),aSrcIter); - USHORT nPos = aPos - pSrcVector->begin(); + ODatabaseExport::TColumnVector::size_type nPos = aPos - pSrcVector->begin(); if( nPos < nCurrentPos) { nAdjustedPos++; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
