diff options
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 4 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/exsrcbrw.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/formadapter.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/sbagrid.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/sbamultiplex.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/DExport.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/misc/WColumnSelect.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 8bbc09474704..4ba23fa758d6 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -884,7 +884,7 @@ void SbaXDataBrowserController::removeModelListeners(const Reference< XControlMo if (xColumns.is()) { sal_Int32 nCount = xColumns->getCount(); - for (sal_uInt16 i=0; i < nCount; ++i) + for (sal_Int32 i=0; i < nCount; ++i) { Reference< XPropertySet > xCol(xColumns->getByIndex(i),UNO_QUERY); RemoveColumnListener(xCol); @@ -2642,7 +2642,7 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun:: if (xColumns.is()) { sal_Int32 nCount = xColumns->getCount(); - for (sal_uInt16 i=0; i < nCount; ++i) + for (sal_Int32 i=0; i < nCount; ++i) { Reference< XPropertySet > xCol(xColumns->getByIndex(i),UNO_QUERY); AddColumnListener(xCol); diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 803237f43289..9630d4473565 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -218,7 +218,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U Reference< XRowSet > xMasterForm; // search the arguments for the master form - for (sal_uInt16 i=0; i<aArgs.getLength(); ++i, ++pArguments) + for (sal_Int32 i=0; i<aArgs.getLength(); ++i, ++pArguments) { if ( (pArguments->Name == "MasterForm") && (pArguments->Value.getValueTypeClass() == TypeClass_INTERFACE) ) { diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 5b2fbb54c2e9..a8da57849df5 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1338,7 +1338,7 @@ Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL SbaXFormAdapter::getP // set them all to DEFAULT Sequence< ::com::sun::star::beans::PropertyState> aReturn(aPropertyName.getLength()); ::com::sun::star::beans::PropertyState* pStates = aReturn.getArray(); - for (sal_uInt16 i=0; i<aPropertyName.getLength(); ++i, ++pStates) + for (sal_Int32 i=0; i<aPropertyName.getLength(); ++i, ++pStates) *pStates = ::com::sun::star::beans::PropertyState_DEFAULT_VALUE; return aReturn; } diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index c2509dcd00cd..e7fbbd4bfcef 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -430,7 +430,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa SolarMutexGuard aGuard; sal_Int16 nColId = -1; const PropertyValue* pArgs = aArgs.getConstArray(); - for (sal_uInt16 i=0; i<aArgs.getLength(); ++i, ++pArgs) + for (sal_Int32 i=0; i<aArgs.getLength(); ++i, ++pArgs) { if (pArgs->Name == "ColumnViewPos") { diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx index 815f6745aff8..4f8bbe0a6933 100644 --- a/dbaccess/source/ui/browser/sbamultiplex.cxx +++ b/dbaccess/source/ui/browser/sbamultiplex.cxx @@ -86,7 +86,7 @@ void SbaXPropertiesChangeMultiplexer::propertiesChange(const ::com::sun::star::u ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent> aMulti(aEvts); ::com::sun::star::beans::PropertyChangeEvent* pMulti = aMulti.getArray(); - for (sal_uInt16 i=0; i<aMulti.getLength(); ++i, ++pMulti) + for (sal_Int32 i=0; i<aMulti.getLength(); ++i, ++pMulti) pMulti->Source = &m_rParent; ::cppu::OInterfaceIteratorHelper aIt(*this); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 67d464ada188..a2490f3e4829 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -833,7 +833,7 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R ::std::vector< OUString> aInsertList; aInsertList.resize(aDestColumnNames.getLength()+1); sal_Int32 i = 0; - for(sal_uInt32 j=0; j < aInsertList.size() ;++i,++j) + for(size_t j=0; j < aInsertList.size() ;++i,++j) { ODatabaseExport::TPositions::const_iterator aFind = ::std::find_if(_rvColumns.begin(),_rvColumns.end(), ::o3tl::compose1(::std::bind2nd(::std::equal_to<sal_Int32>(),i+1),::o3tl::select2nd<ODatabaseExport::TPositions::value_type>())); diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 71df15d4e64c..ca24bc20c8ed 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -884,7 +884,7 @@ bool callColumnFormatDialog(vcl::Window* _pParent, { const sal_uInt32* pDeletedKeys = pInfoItem->GetDelArray(); - for (sal_uInt16 i=0; i< pInfoItem->GetDelCount(); ++i, ++pDeletedKeys) + for (sal_uInt32 i=0; i< pInfoItem->GetDelCount(); ++i, ++pDeletedKeys) _pFormatter->DeleteEntry(*pDeletedKeys); } } diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index d9ca01bf3565..bfe001ab59c3 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -167,7 +167,7 @@ bool OWizColumnSelect::LeavePage() m_pParent->clearDestColumns(); - for(sal_uInt16 i=0 ; i< m_pNewColumnNames->GetEntryCount();++i) + for(sal_Int32 i=0 ; i< m_pNewColumnNames->GetEntryCount();++i) { OFieldDescription* pField = static_cast<OFieldDescription*>(m_pNewColumnNames->GetEntryData(i)); OSL_ENSURE(pField,"The field information can not be null!"); @@ -226,7 +226,7 @@ IMPL_LINK( OWizColumnSelect, ButtonClickHdl, Button *, pButton ) if(!bAll) { - for(sal_uInt16 i=0; i < pLeft->GetSelectEntryCount(); ++i) + for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i) moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase); for(sal_uInt16 j=pLeft->GetSelectEntryCount(); j ; --j) @@ -272,7 +272,7 @@ IMPL_LINK( OWizColumnSelect, ListDoubleClickHdl, ListBox *, pListBox ) ::std::vector< OUString> aRightColumns; fillColumns(pRight,aRightColumns); - for(sal_uInt16 i=0; i < pLeft->GetSelectEntryCount(); ++i) + for(sal_Int32 i=0; i < pLeft->GetSelectEntryCount(); ++i) moveColumn(pRight,pLeft,aRightColumns,pLeft->GetSelectEntry(i),sExtraChars,nMaxNameLen,aCase); for(sal_uInt16 j=pLeft->GetSelectEntryCount(); j ; --j) pLeft->RemoveEntry(pLeft->GetSelectEntry(j-1)); diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 8cdb1012d338..153579fdab2d 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2303,7 +2303,7 @@ namespace OQueryController& rController = static_cast<OQueryController&>(_pView->getController()); EOrderDir eOrderDir; - for( sal_uInt32 i=0 ; i<pNode->count() ; i++ ) + for( size_t i=0 ; i<pNode->count() ; i++ ) { OTableFieldDescRef aDragLeft = new OTableFieldDesc(); eOrderDir = ORDER_ASC; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index c474a19a6bbe..098ba2de4fda 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2047,7 +2047,7 @@ void OSelectionBrowseBox::SetRowVisible(sal_uInt16 _nWhich, bool _bVis) long OSelectionBrowseBox::GetBrowseRow(long nRowId) const { sal_uInt16 nCount(0); - for(sal_uInt16 i = 0 ; i < nRowId ; ++i) + for(long i = 0 ; i < nRowId ; ++i) { if ( m_bVisibleRow[i] ) ++nCount; |