diff options
45 files changed, 81 insertions, 81 deletions
diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx index 2fd53e44dd64..cee6f0247e54 100644 --- a/compilerplugins/clang/loopvartoosmall.cxx +++ b/compilerplugins/clang/loopvartoosmall.cxx @@ -103,8 +103,8 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt ) report( DiagnosticsEngine::Warning, "loop index type is smaller than length type. " + qt.getAsString() + " < " + qt2.getAsString(), - stmt->getLocStart()) - << stmt->getSourceRange(); + stmt->getInit()->getLocStart()) + << stmt->getInit()->getSourceRange(); // stmt->getCond()->dump(); } return true; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index f49bdc6202de..1d8d157e638b 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -964,7 +964,7 @@ try OUString sPropClassId("ClassId"); OUString sFormattedServiceName( "com.sun.star.form.component.FormattedField" ); - for (sal_Int16 i=0; i<aOldProperties.getLength(); ++i) + for (sal_Int32 i=0; i<aOldProperties.getLength(); ++i) { if ( (!pOldProps[i].Name.equals(sPropDefaultControl)) && (!pOldProps[i].Name.equals(sPropLabelControl)) diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 4e5b8b473574..6b202c3575a4 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -525,7 +525,7 @@ void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLP { const OSQLParseNode* pColumnCommalist = pJoin_spec->getChild(2); // All columns in the column_commalist ... - for (sal_uInt32 i = 0; i < pColumnCommalist->count(); i++) + for (size_t i = 0; i < pColumnCommalist->count(); i++) { const OSQLParseNode * pCol = pColumnCommalist->getChild(i); // add twice because the column must exists in both tables @@ -619,7 +619,7 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLP const OSQLParseNode* pTableName = NULL; OUString aTableRange; - for (sal_uInt32 i = 0; i < pTableRefCommalist->count(); i++) + for (size_t i = 0; i < pTableRefCommalist->count(); i++) { // Process FROM clause aTableRange.clear(); @@ -868,7 +868,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo if (!SQL_ISRULE(pSelectNode,base_table_element_commalist)) return ; - for (sal_uInt32 i = 0; i < pSelectNode->count(); i++) + for (size_t i = 0; i < pSelectNode->count(); i++) { OSQLParseNode *pColumnRef = pSelectNode->getChild(i); @@ -945,7 +945,7 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele // SELECT column[,column] oder SELECT COUNT(*) ... OSQLParseNode * pSelection = pSelectNode->getChild(2); - for (sal_uInt32 i = 0; i < pSelection->count(); i++) + for (size_t i = 0; i < pSelection->count(); i++) { OSQLParseNode *pColumnRef = pSelection->getChild(i); diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 1293364ba695..5144ea8dfa70 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1756,7 +1756,7 @@ bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodePara void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString& rColumnName) { - for (sal_uInt32 i=0;i<count();++i) + for (size_t i=0;i<count();++i) { if (SQL_ISRULE(this,column_ref) && count() == 1 && getChild(0)->getTokenValue() == rColumnName) { diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index d59654f713e5..f1f511288b99 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -462,11 +462,11 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, bool bInfoBox ) fprintf( fp, "\nMinAutoPaperSize: %li x %li", pEE->GetMinAutoPaperSize().Width(), pEE->GetMinAutoPaperSize().Height() ); fprintf( fp, "\nUpdate: %i", pEE->GetUpdateMode() ); fprintf( fp, "\nNumber of Views: %" SAL_PRI_SIZET "i", pEE->GetViewCount() ); - for ( sal_uInt16 nView = 0; nView < pEE->GetViewCount(); nView++ ) + for ( size_t nView = 0; nView < pEE->GetViewCount(); nView++ ) { EditView* pV = pEE->GetView( nView ); DBG_ASSERT( pV, "View not found!" ); - fprintf( fp, "\nView %i: Focus=%i", nView, pV->GetWindow()->HasFocus() ); + fprintf( fp, "\nView %zu: Focus=%i", nView, pV->GetWindow()->HasFocus() ); Rectangle aR( pV->GetOutputArea() ); fprintf( fp, "\n OutputArea: nX=%li, nY=%li, dX=%li, dY=%li, MapMode = %i", aR.TopLeft().X(), aR.TopLeft().Y(), aR.GetSize().Width(), aR.GetSize().Height() , pV->GetWindow()->GetMapMode().GetMapUnit() ); aR = pV->GetVisArea(); @@ -492,7 +492,7 @@ bool ParaPortion::DbgCheckTextPortions(ParaPortion const& rPara) { // check, if Portion length ok: sal_uInt16 nXLen = 0; - for (sal_uInt16 nPortion = 0; nPortion < rPara.aTextPortionList.Count(); nPortion++) + for (sal_Int32 nPortion = 0; nPortion < rPara.aTextPortionList.Count(); nPortion++) { nXLen = nXLen + rPara.aTextPortionList[nPortion]->GetLen(); } diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index 6f447b90f291..833583d847f8 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -1359,7 +1359,7 @@ void ContentNode::ExpandAttribs( sal_Int32 nIndex, sal_Int32 nNew, SfxItemPool& { // Check if this kind of attribute was empty and expanded here... sal_uInt16 nW = pAttrib->GetItem()->Which(); - for ( sal_uInt16 nA = 0; nA < nAttr; nA++ ) + for ( sal_Int32 nA = 0; nA < nAttr; nA++ ) { const EditCharAttrib& r = aCharAttribList.GetAttribs()[nA]; if ( ( r.GetStart() == 0 ) && ( r.GetItem()->Which() == nW ) ) diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index f9d413189e1f..49ead0483d8b 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -2133,7 +2133,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range aOldPositions, sal_Int32 n ParaPortion* pDestPortion = GetParaPortions().SafeGetObject( nNewPos ); ParaPortionList aTmpPortionList; - for (sal_Int32 i = aOldPositions.Min(); i <= aOldPositions.Max(); i++ ) + for (long i = aOldPositions.Min(); i <= aOldPositions.Max(); i++ ) { // always aOldPositions.Min(), since Remove(). ParaPortion* pTmpPortion = GetParaPortions().Release(aOldPositions.Min()); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index fb071e08799e..5660bb40efba 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -2320,7 +2320,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_Int32& rS if ( mpIMEInfos && mpIMEInfos->nLen && mpIMEInfos->pAttribs && ( mpIMEInfos->aPos.GetNode() == pNode ) ) { sal_uInt16 nLastAttr = 0xFFFF; - for( sal_uInt16 n = 0; n < mpIMEInfos->nLen; n++ ) + for( sal_Int32 n = 0; n < mpIMEInfos->nLen; n++ ) { if ( mpIMEInfos->pAttribs[n] != nLastAttr ) { diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 726c4065e6d1..f8150c8496fa 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -209,7 +209,7 @@ EditUndoSetAttribs* ImpEditEngine::CreateAttribUndo( EditSelection aSel, const S ContentAttribsInfo* pInf = new ContentAttribsInfo( pNode->GetContentAttribs().GetItems() ); pUndo->AppendContentInfo(pInf); - for ( sal_uInt16 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ ) + for ( sal_Int32 nAttr = 0; nAttr < pNode->GetCharAttribs().Count(); nAttr++ ) { const EditCharAttrib& rAttr = pNode->GetCharAttribs().GetAttribs()[nAttr]; if (rAttr.GetLen()) diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 50140033e1ba..337d714a9ce3 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -156,7 +156,7 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst, sal_Int32 nCount = pFontList->GetFontNameCount(); aFontNameSeq.realloc( nCount ); - for ( sal_uInt16 i = 0; i < nCount; i++ ) + for ( sal_Int32 i = 0; i < nCount; i++ ) aFontNameSeq[i] = pFontList->GetFontName(i).GetName(); } } diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 76e10acc631f..fc84b22bd337 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2514,7 +2514,7 @@ bool SvxAutoCorrectLanguageLists::MakeCombinedChanges( std::vector<SvxAutocorrWo if( bRet ) { - for ( sal_uInt32 i=0; i < aDeleteEntries.size(); i++ ) + for ( size_t i=0; i < aDeleteEntries.size(); i++ ) { SvxAutocorrWord aWordToDelete = aDeleteEntries[i]; SvxAutocorrWord *pFoundEntry = pAutocorr_List->FindAndRemove( &aWordToDelete ); @@ -2538,7 +2538,7 @@ bool SvxAutoCorrectLanguageLists::MakeCombinedChanges( std::vector<SvxAutocorrWo } } - for ( sal_uInt32 i=0; i < aNewEntries.size(); i++ ) + for ( size_t i=0; i < aNewEntries.size(); i++ ) { SvxAutocorrWord *pWordToAdd = new SvxAutocorrWord( aNewEntries[i].GetShort(), aNewEntries[i].GetLong(), true ); SvxAutocorrWord *pRemoved = pAutocorr_List->FindAndRemove( pWordToAdd ); diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 56ef7368e8fc..b70fd01a3a24 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -1072,7 +1072,7 @@ void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet ) // then process all the children if( rSet.pChildList ) - for( sal_uInt16 n = 0; n < rSet.pChildList->size(); ++n ) + for( size_t n = 0; n < rSet.pChildList->size(); ++n ) SetAttrSet( (*rSet.pChildList)[ n ] ); } diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index e6580b50e922..95ca5babe51d 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -524,7 +524,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu ) // remove all old picklist entries from menu handler if ( nRemoveItemCount > 0 ) { - for( sal_uInt32 nIndex = m_aMenuItemHandlerVector.size() - nRemoveItemCount; + for( size_t nIndex = m_aMenuItemHandlerVector.size() - nRemoveItemCount; nIndex < m_aMenuItemHandlerVector.size(); ) { delete m_aMenuItemHandlerVector.at( nIndex ); diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 0238ff01ed4c..1e4f97d48a12 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -456,7 +456,7 @@ bool ImageManagerImpl::implts_loadUserImages( sal_Int32 nCount = pList->pImageItemList->size(); std::vector< OUString > aUserImagesVector; aUserImagesVector.reserve(nCount); - for ( sal_uInt16 i=0; i < nCount; i++ ) + for ( sal_Int32 i=0; i < nCount; i++ ) { const ImageItemDescriptor* pItem = &(*pList->pImageItemList)[i]; aUserImagesVector.push_back( pItem->aCommandURL ); diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index e4030b766d43..f1d0391ff629 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -1597,9 +1597,9 @@ void SAL_CALL ModuleUIConfigurationManager::reload() throw (::com::sun::star::un aGuard.clear(); // Notify our listeners - for ( sal_uInt32 j = 0; j < aRemoveNotifyContainer.size(); j++ ) + for ( size_t j = 0; j < aRemoveNotifyContainer.size(); j++ ) implts_notifyContainerListener( aRemoveNotifyContainer[j], NotifyOp_Remove ); - for ( sal_uInt32 k = 0; k < aReplaceNotifyContainer.size(); k++ ) + for ( size_t k = 0; k < aReplaceNotifyContainer.size(); k++ ) implts_notifyContainerListener( aReplaceNotifyContainer[k], NotifyOp_Replace ); } } diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 2e720def5f45..bbb25d0f9f40 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -839,7 +839,7 @@ void SAL_CALL UIConfigurationManager::reset() throw (::com::sun::star::uno::Runt aGuard.clear(); // Notify our listeners - for ( sal_uInt32 k = 0; k < aRemoveEventNotifyContainer.size(); k++ ) + for ( size_t k = 0; k < aRemoveEventNotifyContainer.size(); k++ ) implts_notifyContainerListener( aRemoveEventNotifyContainer[k], NotifyOp_Remove ); } catch ( const ::com::sun::star::lang::IllegalArgumentException& ) @@ -1300,9 +1300,9 @@ void SAL_CALL UIConfigurationManager::reload() throw (::com::sun::star::uno::Exc aGuard.clear(); // Notify our listeners - for ( sal_uInt32 j = 0; j < aRemoveNotifyContainer.size(); j++ ) + for ( size_t j = 0; j < aRemoveNotifyContainer.size(); j++ ) implts_notifyContainerListener( aRemoveNotifyContainer[j], NotifyOp_Remove ); - for ( sal_uInt32 k = 0; k < aReplaceNotifyContainer.size(); k++ ) + for ( size_t k = 0; k < aReplaceNotifyContainer.size(); k++ ) implts_notifyContainerListener( aReplaceNotifyContainer[k], NotifyOp_Replace ); } } diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index c2254a9d4e82..6b5f3e879072 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -118,7 +118,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: if ( pVCLPopupMenu ) { const OUString aVerbCommand( ".uno:ObjectMenue?VerbID:short=" ); - for ( sal_uInt16 i = 0; i < rVerbCommandSeq.getLength(); i++ ) + for ( sal_Int32 i = 0; i < rVerbCommandSeq.getLength(); i++ ) { const com::sun::star::embed::VerbDescriptor& rVerb = pVerbCommandArray[i]; if ( rVerb.VerbAttributes & com::sun::star::embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU ) diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index d78cd8f5abd8..8ecf8e4e24a6 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -646,7 +646,7 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw { ImageListDescriptor* pImageList = m_aImageListsItems.pImageList; - for ( sal_uInt16 i = 0; i < m_aImageListsItems.pImageList->size(); i++ ) + for ( size_t i = 0; i < m_aImageListsItems.pImageList->size(); i++ ) { const ImageListItemDescriptor* pImageItems = &(*pImageList)[i]; WriteImageList( pImageItems ); @@ -728,7 +728,7 @@ void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* ImageItemListDescriptor* pImageItemList = pImageList->pImageItemList; if ( pImageItemList ) { - for ( sal_uInt16 i = 0; i < pImageItemList->size(); i++ ) + for ( size_t i = 0; i < pImageItemList->size(); i++ ) WriteImage( &(*pImageItemList)[i] ); } @@ -763,7 +763,7 @@ void OWriteImagesDocumentHandler::WriteExternalImageList( const ExternalImageIte m_xWriteDocumentHandler->startElement( OUString( ELEMENT_NS_EXTERNALIMAGES ), m_xEmptyList ); m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - for ( sal_uInt16 i = 0; i < pExternalImageList->size(); i++ ) + for ( size_t i = 0; i < pExternalImageList->size(); i++ ) { const ExternalImageItemDescriptor* pItem = &(*pExternalImageList)[i]; WriteExternalImage( pItem ); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 3d696cb23cdd..76c4d4ff5d49 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -424,7 +424,7 @@ void SfxBindings::Update_Impl // Post Status const SfxInterface *pInterface = rDispat.GetShell(pMsgServer->GetShellLevel())->GetInterface(); - for ( sal_uInt16 nPos = 0; nPos < aFound.size(); ++nPos ) + for ( size_t nPos = 0; nPos < aFound.size(); ++nPos ) { const SfxFoundCache_Impl& rFound = aFound[nPos]; sal_uInt16 nWhich = rFound.nWhichId; @@ -706,7 +706,7 @@ void SfxBindings::InvalidateAll pImp->bMsgDirty = pImp->bMsgDirty || pImp->bAllMsgDirty || bWithMsg; pImp->bAllDirty = true; - for ( sal_uInt16 n = 0; n < pImp->pCaches->size(); ++n ) + for ( size_t n = 0; n < pImp->pCaches->size(); ++n ) (*pImp->pCaches)[n]->Invalidate(bWithMsg); pImp->nMsgPos = 0; @@ -807,7 +807,7 @@ void SfxBindings::InvalidateShell sal_uInt16 nLevel = pDispatcher->GetShellLevel(rSh); if ( nLevel != USHRT_MAX ) { - for ( sal_uInt16 n = 0; n < pImp->pCaches->size(); ++n ) + for ( size_t n = 0; n < pImp->pCaches->size(); ++n ) { SfxStateCache *pCache = (*pImp->pCaches)[n]; const SfxSlotServer *pMsgServer = diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 5e6f9bc2898c..f9f2ef8896ab 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -558,7 +558,7 @@ sal_uInt16 SfxDispatcher::GetShellLevel(const SfxShell& rShell) SFX_STACK(SfxDispatcher::GetShellLevel); Flush(); - for ( sal_uInt16 n = 0; n < xImp->aStack.size(); ++n ) + for ( size_t n = 0; n < xImp->aStack.size(); ++n ) if ( *( xImp->aStack.rbegin() + n ) == &rShell ) return n; if ( xImp->pParent ) @@ -731,7 +731,7 @@ void SfxDispatcher::DoDeactivate_Impl(bool bMDI, SfxViewFrame* pNew) if ( IsAppDispatcher() && !pSfxApp->IsDowning() ) return; - for ( sal_uInt16 i = 0; i < xImp->aStack.size(); ++i ) + for ( size_t i = 0; i < xImp->aStack.size(); ++i ) (*(xImp->aStack.rbegin() + i))->DoDeactivate_Impl(xImp->pFrame, bMDI); bool bHidePopups = bMDI && xImp->pFrame; diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index ac0026d4ef34..f3ca3d9f67ce 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -125,7 +125,7 @@ const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId ) return 0; // First, search their own interfaces - for ( sal_uInt16 nInterf = 0; nInterf < _pInterfaces->size(); ++nInterf ) + for ( size_t nInterf = 0; nInterf < _pInterfaces->size(); ++nInterf ) { const SfxSlot *pDef = ((*_pInterfaces)[nInterf])->GetSlot(nId); if ( pDef ) diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 0e47101b7385..eb65995d2719 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -302,7 +302,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem ) , m_bDeleteUserData( rItem.m_bDeleteUserData ) , m_bUseUserData( rItem.m_bUseUserData ) { - for ( sal_uInt32 i = 0; i < rItem.m_aCustomProperties.size(); i++ ) + for ( size_t i = 0; i < rItem.m_aCustomProperties.size(); i++ ) { CustomProperty* pProp = new CustomProperty( rItem.m_aCustomProperties[i]->m_sName, rItem.m_aCustomProperties[i]->m_aValue ); @@ -421,7 +421,7 @@ void SfxDocumentInfoItem::UpdateDocumentInfo( } } - for ( sal_uInt32 k = 0; k < m_aCustomProperties.size(); ++k ) + for ( size_t k = 0; k < m_aCustomProperties.size(); ++k ) { try { @@ -456,7 +456,7 @@ void SfxDocumentInfoItem::SetUseUserData( bool bSet ) std::vector< CustomProperty* > SfxDocumentInfoItem::GetCustomProperties() const { std::vector< CustomProperty* > aRet; - for ( sal_uInt32 i = 0; i < m_aCustomProperties.size(); i++ ) + for ( size_t i = 0; i < m_aCustomProperties.size(); i++ ) { CustomProperty* pProp = new CustomProperty( m_aCustomProperties[i]->m_sName, m_aCustomProperties[i]->m_aValue ); @@ -468,7 +468,7 @@ std::vector< CustomProperty* > SfxDocumentInfoItem::GetCustomProperties() const void SfxDocumentInfoItem::ClearCustomProperties() { - for ( sal_uInt32 i = 0; i < m_aCustomProperties.size(); i++ ) + for ( size_t i = 0; i < m_aCustomProperties.size(); i++ ) delete m_aCustomProperties[i]; m_aCustomProperties.clear(); } @@ -2253,7 +2253,7 @@ void SfxCustomPropertiesPage::Reset( const SfxItemSet* rItemSet ) m_pPropertiesCtrl->ClearAllLines(); const SfxDocumentInfoItem& rInfoItem = static_cast<const SfxDocumentInfoItem &>(rItemSet->Get(SID_DOCINFO)); std::vector< CustomProperty* > aCustomProps = rInfoItem.GetCustomProperties(); - for ( sal_uInt32 i = 0; i < aCustomProps.size(); i++ ) + for ( size_t i = 0; i < aCustomProps.size(); i++ ) { m_pPropertiesCtrl->AddLine( aCustomProps[i]->m_sName, aCustomProps[i]->m_aValue, false ); } diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 8dc5303a5572..1b1b33b810a1 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -448,7 +448,7 @@ void SfxSplitWindow::Split() // apply FIXED item size as 'original' item size to improve layouting of undock-dock-cycle of a window { DeactivateUpdateMode aDeactivateUpdateMode( *this ); - for ( sal_uInt16 i = 0; i < aNewOrgSizes.size(); ++i ) + for ( size_t i = 0; i < aNewOrgSizes.size(); ++i ) { SetItemSize( aNewOrgSizes[i].first, aNewOrgSizes[i].second ); } @@ -792,7 +792,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, } // apply new item sizes DeactivateUpdateMode aDeactivateUpdateMode( *this ); - for ( sal_uInt16 i = 0; i < aNewOrgSizes.size(); ++i ) + for ( size_t i = 0; i < aNewOrgSizes.size(); ++i ) { SetItemSize( aNewOrgSizes[i].first, aNewOrgSizes[i].second ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 833a8afedae7..e7952ca6b7ef 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -547,14 +547,14 @@ public: aName(rName), aParent(rParent), pChildren(0) {} ~StyleTree_Impl(); void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX); - sal_uIntPtr Count(); + size_t Count(); OUString getName() { return aName; } OUString getParent() { return aParent; } StyleTree_Impl *operator[](size_t idx) const { return pChildren[idx]; } }; -sal_uIntPtr StyleTree_Impl::Count() +size_t StyleTree_Impl::Count() { return pChildren.size(); } @@ -642,7 +642,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox, pBox->GetModel()->InvalidateEntry(pTreeListEntry); - for(sal_uInt16 i = 0; i < pEntry->Count(); ++i) + for(size_t i = 0; i < pEntry->Count(); ++i) { FillBox_Impl(pBox, (*pEntry)[i], rEntries, eStyleFamily, pTreeListEntry); } diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 3968db6d66d4..c488b60c4d5f 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -152,7 +152,7 @@ void impl_FillURLList( sfx2::FileDialogHelper* _pFileDlg, std::vector<OUString>& { _rpURLList.clear(); - for ( sal_uInt16 i = 0; i < aPathSeq.getLength(); ++i ) + for ( sal_Int32 i = 0; i < aPathSeq.getLength(); ++i ) { INetURLObject aPathObj( aPathSeq[i] ); _rpURLList.push_back(aPathObj.GetMainURL(INetURLObject::NO_DECODE)); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 526f66e5f64a..60bd56815e15 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -503,7 +503,7 @@ SfxObjectShell* SfxObjectShell::GetFirst SfxObjectShellArr_Impl &rDocs = SfxGetpApp()->GetObjectShells_Impl(); // search for a SfxDocument of the specified type - for ( sal_uInt16 nPos = 0; nPos < rDocs.size(); ++nPos ) + for ( size_t nPos = 0; nPos < rDocs.size(); ++nPos ) { SfxObjectShell* pSh = rDocs[ nPos ]; if ( bOnlyVisible && pSh->IsPreview() && pSh->IsReadOnly() ) diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 8ff9a78b58d4..be6a260c13ff 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -270,7 +270,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB if ( pFactories ) { SfxMenuCtrlFactArr_Impl &rFactories = *pFactories; - for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory ) + for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory ) if ( rFactories[nFactory].nTypeId == aSlotType && ( ( rFactories[nFactory].nSlotId == 0 ) || ( rFactories[nFactory].nSlotId == nId) ) ) @@ -280,7 +280,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB SfxMenuCtrlFactArr_Impl &rFactories = pApp->GetMenuCtrlFactories_Impl(); - for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory ) + for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory ) if ( rFactories[nFactory].nTypeId == aSlotType && ( ( rFactories[nFactory].nSlotId == 0 ) || ( rFactories[nFactory].nSlotId == nId) ) ) diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 782d041b7081..74ee7b664e02 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -108,7 +108,7 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen SfxObjectShell* pDoc = pView->GetObjectShell(); pMenu->InsertSeparator(); sal_uInt16 nr=0; - for ( sal_uInt16 n = 0; n < aVerbs.getLength(); ++n ) + for ( sal_Int32 n = 0; n < aVerbs.getLength(); ++n ) { // check for ReadOnly verbs if ( pDoc->IsReadOnly() && !(aVerbs[n].VerbAttributes & embed::VerbAttributes::MS_VERBATTR_NEVERDIRTIES) ) @@ -169,7 +169,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) if (!sThesImplName.isEmpty() && !aSynonymsImageUrl.isEmpty()) aImage = Image( aSynonymsImageUrl ); - for (sal_uInt16 i = 0; (size_t)i < nNumSynonyms; ++i) + for (size_t i = 0; i < nNumSynonyms; ++i) { //! item ids should start with values > 0, since 0 has special meaning const sal_uInt16 nId = i + 1; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 2ca790ebf76a..85defbfc21fb 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -858,7 +858,7 @@ IMPL_LINK_TYPED( SfxVirtualMenu, Activate, Menu *, pMenu, bool ) // append new window list entries to menu pMenu->InsertSeparator(); nItemId = START_ITEMID_WINDOWLIST; - for ( sal_uInt32 i = 0; i < aNewWindowListVector.size(); i++ ) + for ( size_t i = 0; i < aNewWindowListVector.size(); i++ ) { pMenu->InsertItem( nItemId, aNewWindowListVector.at( i ), MenuItemBits::RADIOCHECK ); if ( nItemId == nActiveItemId ) diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index c0ded64c7da3..d3dea7c7fe7d 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -613,7 +613,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl if ( pFactories ) { SfxStbCtrlFactArr_Impl &rFactories = *pFactories; - for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory ) + for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory ) if ( rFactories[nFactory].nTypeId == aSlotType && ( ( rFactories[nFactory].nSlotId == 0 ) || ( rFactories[nFactory].nSlotId == nSlotID) ) ) @@ -622,7 +622,7 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl } SfxStbCtrlFactArr_Impl &rFactories = pApp->GetStbCtrlFactories_Impl(); - for ( sal_uInt16 nFactory = 0; nFactory < rFactories.size(); ++nFactory ) + for ( size_t nFactory = 0; nFactory < rFactories.size(); ++nFactory ) if ( rFactories[nFactory].nTypeId == aSlotType && ( ( rFactories[nFactory].nSlotId == 0 ) || ( rFactories[nFactory].nSlotId == nSlotID) ) ) diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 7bdda110e279..95509a817032 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -125,7 +125,7 @@ SfxImageManager_Impl::~SfxImageManager_Impl() m_aOpt.RemoveListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) ); if (m_bAppEventListener) Application::RemoveEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) ); - for ( sal_uInt32 i = 0; i < m_aToolBoxes.size(); i++ ) + for ( size_t i = 0; i < m_aToolBoxes.size(); i++ ) delete m_aToolBoxes[i]; } @@ -163,7 +163,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) m_nSymbolsSize = nNewSymbolsSize; bool bLarge( m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE ); - for ( sal_uInt32 n=0; n < m_aToolBoxes.size(); n++ ) + for ( size_t n=0; n < m_aToolBoxes.size(); n++ ) { ToolBoxInf_Impl *pInf = m_aToolBoxes[n]; if ( pInf->nFlags & SfxToolboxFlags::CHANGESYMBOLSET ) @@ -315,7 +315,7 @@ void SfxImageManager::ReleaseToolBox( ToolBox *pBox ) { SolarMutexGuard aGuard; - for ( sal_uInt32 n=0; n < pImp->m_aToolBoxes.size(); n++ ) + for ( size_t n=0; n < pImp->m_aToolBoxes.size(); n++ ) { if ((pImp->m_aToolBoxes[n])->pToolBox == pBox ) { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 8119842b38a6..bcca3cfaa3e7 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1542,7 +1542,7 @@ SfxViewFrame* SfxViewFrame::GetFirst SfxViewFrameArr_Impl &rFrames = pSfxApp->GetViewFrames_Impl(); // search for a SfxDocument of the specified type - for ( sal_uInt16 nPos = 0; nPos < rFrames.size(); ++nPos ) + for ( size_t nPos = 0; nPos < rFrames.size(); ++nPos ) { SfxViewFrame *pFrame = rFrames[nPos]; if ( ( !pDoc || pDoc == pFrame->GetObjectShell() ) diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 431ba976591c..d41ae370ad63 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1512,7 +1512,7 @@ SfxViewShell* SfxViewShell::GetFirst // search for a SfxViewShell of the specified type SfxViewShellArr_Impl &rShells = SfxGetpApp()->GetViewShells_Impl(); SfxViewFrameArr_Impl &rFrames = SfxGetpApp()->GetViewFrames_Impl(); - for ( sal_uInt16 nPos = 0; nPos < rShells.size(); ++nPos ) + for ( size_t nPos = 0; nPos < rShells.size(); ++nPos ) { SfxViewShell *pShell = rShells[nPos]; if ( pShell ) @@ -1520,7 +1520,7 @@ SfxViewShell* SfxViewShell::GetFirst // sometimes dangling SfxViewShells exist that point to a dead SfxViewFrame // these ViewShells shouldn't be accessible anymore // a destroyed ViewFrame is not in the ViewFrame array anymore, so checking this array helps - for ( sal_uInt16 n=0; n<rFrames.size(); ++n ) + for ( size_t n=0; n<rFrames.size(); ++n ) { SfxViewFrame *pFrame = rFrames[n]; if ( pFrame == pShell->GetViewFrame() ) @@ -1562,7 +1562,7 @@ SfxViewShell* SfxViewShell::GetNext // sometimes dangling SfxViewShells exist that point to a dead SfxViewFrame // these ViewShells shouldn't be accessible anymore // a destroyed ViewFrame is not in the ViewFrame array anymore, so checking this array helps - for ( sal_uInt16 n=0; n<rFrames.size(); ++n ) + for ( size_t n=0; n<rFrames.size(); ++n ) { SfxViewFrame *pFrame = rFrames[n]; if ( pFrame == pShell->GetViewFrame() ) @@ -1595,7 +1595,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC, { // avoid access to dangling ViewShells SfxViewFrameArr_Impl &rFrames = SfxGetpApp()->GetViewFrames_Impl(); - for ( sal_uInt16 n=0; n<rFrames.size(); ++n ) + for ( size_t n=0; n<rFrames.size(); ++n ) { SfxViewFrame *frame = rFrames[n]; if ( frame == GetViewFrame() && &rBC == GetObjectShell() ) diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 809717255bb7..51a0d76bf68e 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -205,7 +205,7 @@ void getAllHit3DObjectsSortedFrontToBack( ::std::vector< basegfx::B3DPoint > aHitsWithObject; getAllHit3DObjectWithRelativePoint(aFront, aBack, *pCandidate, aViewInfo3D, aHitsWithObject, false); - for(sal_uInt32 a(0); a < aHitsWithObject.size(); a++) + for(size_t a(0); a < aHitsWithObject.size(); a++) { const basegfx::B3DPoint aPointInViewCoordinates(aViewInfo3D.getObjectToView() * aHitsWithObject[a]); aDepthAndObjectResults.push_back(ImplPairDephAndObject(pCandidate, aPointInViewCoordinates.getZ())); diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx index 5eb9fba929be..f26e3a7a4467 100644 --- a/svx/source/svdraw/clonelist.cxx +++ b/svx/source/svdraw/clonelist.cxx @@ -71,7 +71,7 @@ void CloneList::CopyConnections() const { sal_uInt32 cloneCount = maCloneList.size(); - for(sal_uInt32 a = 0; a < maOriginalList.size(); a++) + for(size_t a = 0; a < maOriginalList.size(); a++) { const SdrEdgeObj* pOriginalEdge = PTR_CAST(SdrEdgeObj, GetOriginal(a)); SdrEdgeObj* pCloneEdge = PTR_CAST(SdrEdgeObj, GetClone(a)); diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index fd0077da5dd0..e50cadf399d1 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -317,7 +317,7 @@ basegfx::B2DRange SdrDragMethod::getCurrentRange() const void SdrDragMethod::clearSdrDragEntries() { - for(sal_uInt32 a(0); a < maSdrDragEntries.size(); a++) + for(size_t a(0); a < maSdrDragEntries.size(); a++) { delete maSdrDragEntries[a]; } diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index c9a567a2914c..fd3361cb77f2 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -309,7 +309,7 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() // New mechanism to search for necessary disconnections for // changed connectors inside the transitive hull of all at // the beginning of UNDO selected objects - for(sal_uInt32 a(0L); a < rAllMarkedObjects.size(); a++) + for(size_t a(0); a < rAllMarkedObjects.size(); a++) { SdrEdgeObj* pEdge = PTR_CAST(SdrEdgeObj, rAllMarkedObjects[a]); diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 002559e9cc11..1c12fc47f778 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -1612,9 +1612,9 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct) { const double fOpNew(1.0 - fTransparence); - for(int y(0); y < pOld->Height(); y++) + for(long y(0); y < pOld->Height(); y++) { - for(int x(0); x < pOld->Width(); x++) + for(long x(0); x < pOld->Width(); x++) { const double fOpOld(1.0 - (pOld->GetPixel(y, x).GetIndex() * fFactor)); const sal_uInt8 aCol(basegfx::fround((1.0 - (fOpOld * fOpNew)) * 255.0)); @@ -1631,9 +1631,9 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaFloatTransparentAction& rAct) { if(pOld->Width() == pNew->Width() && pOld->Height() == pNew->Height()) { - for(int y(0); y < pOld->Height(); y++) + for(long y(0); y < pOld->Height(); y++) { - for(int x(0); x < pOld->Width(); x++) + for(long x(0); x < pOld->Width(); x++) { const double fOpOld(1.0 - (pOld->GetPixel(y, x).GetIndex() * fFactor)); const double fOpNew(1.0 - (pNew->GetPixel(y, x).GetIndex() * fFactor)); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 3aa99efe1198..190ba765e5ab 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -359,9 +359,9 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS if(pWriteAccess) { - for(sal_Int32 y(0L); y < pReadAccess->Height(); y++) + for(long y(0L); y < pReadAccess->Height(); y++) { - for(sal_Int32 x(0L); x < pReadAccess->Width(); x++) + for(long x(0L); x < pReadAccess->Width(); x++) { sal_uInt16 nLuminance((sal_uInt16)pReadAccess->GetLuminance(y, x) + 1); const BitmapColor aDestColor( diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index b6d382745d57..20adb07fa9b2 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2446,7 +2446,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDas if(!aExtractedHairlines.empty()) { // for SdrObject creation, just copy all to a single Hairline-PolyPolygon - for(sal_uInt32 a(0); a < aExtractedHairlines.size(); a++) + for(size_t a(0); a < aExtractedHairlines.size(); a++) { aMergedHairlinePolyPolygon.append(aExtractedHairlines[a]); } diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 3aa6200f2976..178104844698 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -295,7 +295,7 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis const SvXMLNamespaceMap& rMap = m_rContext.getGlobalContext().GetNamespaceMap(); sal_uInt16 nNamespace; OUString sLocalName; - for (sal_Int16 i=0; i<nAttributeCount; ++i) + for (sal_Int32 i=0; i<nAttributeCount; ++i) { nNamespace = rMap.GetKeyByAttrName(_rxAttrList->getNameByIndex(i), &sLocalName); handleAttribute(nNamespace, sLocalName, _rxAttrList->getValueByIndex(i)); @@ -486,7 +486,7 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA sal_uInt16 nNamespace; OUString sAttributeName; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); - for ( sal_Int16 i = 0; i < nAttributeCount; ++i ) + for ( sal_Int32 i = 0; i < nAttributeCount; ++i ) { nNamespace = rMap.GetKeyByAttrName( _rxAttrList->getNameByIndex( i ), &sAttributeName ); if ( ( XML_NAMESPACE_FORM == nNamespace ) @@ -566,7 +566,7 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr sal_uInt16 nNamespace; OUString sAttributeName; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); - for ( sal_Int16 i = 0; i < nAttributeCount; ++i ) + for ( sal_Int32 i = 0; i < nAttributeCount; ++i ) { nNamespace = rMap.GetKeyByAttrName( _rxAttrList->getNameByIndex( i ), &sAttributeName ); if ( XML_NAMESPACE_OFFICE == nNamespace ) diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 6b7142fa366a..07cf3131cc69 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -218,7 +218,7 @@ void SvXMLNumUsedList_Impl::SetWasUsed(const uno::Sequence<sal_Int32>& rWasUsed) DBG_ASSERT(nWasUsedCount == 0, "WasUsed should be empty"); sal_Int32 nCount(rWasUsed.getLength()); const sal_Int32* pWasUsed = rWasUsed.getConstArray(); - for (sal_uInt16 i = 0; i < nCount; i++, pWasUsed++) + for (sal_Int32 i = 0; i < nCount; i++, pWasUsed++) { std::pair<SvXMLuInt32Set::const_iterator, bool> aPair = aWasUsed.insert( *pWasUsed ); if (aPair.second) diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index a422b2588d20..0c59c7e1217f 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -1609,7 +1609,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter) sal_uInt32 nIndex = NUMBERFORMAT_ENTRY_NOT_FOUND; - for (sal_uInt32 i = 0; i < aMyConditions.size(); i++) + for (size_t i = 0; i < aMyConditions.size(); i++) { SvXMLNumFormatContext* pStyle = const_cast<SvXMLNumFormatContext*>( static_cast<const SvXMLNumFormatContext *>(pStyles->FindStyleChildContext( XML_STYLE_FAMILY_DATA_STYLE, aMyConditions[i].sMapName, false))); diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 652f2b9735eb..3854cde826b5 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -1964,7 +1964,7 @@ void XMLTextImportHelper::SetOutlineStyles( bool bSetEmptyLevels ) } else { - for (sal_uInt32 j = 0; + for (size_t j = 0; j < m_xImpl->m_xOutlineStylesCandidates[i].size(); ++j) { diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index 6a324b71a7ee..b67c8855f839 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -2074,7 +2074,7 @@ XMLParaContext::~XMLParaContext() if( pHints && !pHints->empty() ) { - for( sal_uInt16 i=0; i<pHints->size(); i++ ) + for( size_t i=0; i<pHints->size(); i++ ) { XMLHint_Impl *pHint = &(*pHints)[i]; xAttrCursor->gotoRange( pHint->GetStart(), sal_False ); |