From 57027233275260b066442037a904ec34a703ae09 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 28 May 2015 15:44:10 +0200 Subject: loplugin:loopvartoosmall (cherry picked from commit 6140ca9f1d728475e332f9fa96ee62dda58687ea) Change-Id: Icb31e51575f7fffd36be73bbd87a3c5e56c3aa26 --- framework/source/classes/menumanager.cxx | 2 +- framework/source/uiconfiguration/imagemanagerimpl.cxx | 2 +- framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx | 4 ++-- framework/source/uiconfiguration/uiconfigurationmanager.cxx | 6 +++--- framework/source/uielement/objectmenucontroller.cxx | 2 +- framework/source/xml/imagesdocumenthandler.cxx | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'framework') 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 ); -- cgit v1.2.3