diff options
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/forms/propertyimport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtparai.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
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 ); |