[Libreoffice-commits] core.git: compilerplugins/clang filter/source forms/source formula/source framework/source i18npool/source jvmfwk/plugins lotuswordpro/source package/source svgio/source ucb/source
Noel Grandin
noel at peralex.com
Mon Jun 1 00:59:51 PDT 2015
compilerplugins/clang/loopvartoosmall.cxx | 2 +-
filter/source/flash/swfexporter.cxx | 2 +-
filter/source/graphicfilter/eps/eps.cxx | 2 +-
filter/source/graphicfilter/icgm/actimpr.cxx | 4 ++--
filter/source/graphicfilter/icgm/class4.cxx | 2 +-
filter/source/pdf/impdialog.cxx | 2 +-
filter/source/svg/svgexport.cxx | 2 +-
filter/source/svg/svgreader.cxx | 2 +-
filter/source/svg/svgwriter.cxx | 2 +-
forms/source/component/ListBox.cxx | 6 +++---
formula/source/ui/dlg/formula.cxx | 6 +++---
framework/source/uielement/fontmenucontroller.cxx | 2 +-
i18npool/source/localedata/LocaleNode.cxx | 2 +-
i18npool/source/localedata/localedata.cxx | 4 ++--
i18npool/source/transliteration/transliterationImpl.cxx | 2 +-
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 2 +-
lotuswordpro/source/filter/lwpdrawobj.cxx | 6 +++---
lotuswordpro/source/filter/lwpidxmgr.cxx | 4 ++--
lotuswordpro/source/filter/lwprowlayout.cxx | 6 +++---
lotuswordpro/source/filter/lwpsilverbullet.cxx | 2 +-
lotuswordpro/source/filter/xfilter/xfinputlist.hxx | 2 +-
package/source/manifest/ManifestImport.cxx | 2 +-
package/source/zippackage/ZipPackageStream.cxx | 2 +-
svgio/source/svgreader/svgcharacternode.cxx | 6 +++---
svgio/source/svgreader/svgnode.cxx | 4 ++--
svgio/source/svgreader/svgstylenode.cxx | 2 +-
ucb/source/ucp/file/shell.cxx | 2 +-
27 files changed, 41 insertions(+), 41 deletions(-)
New commits:
commit 55bc128636596032c23ee855904822ad813986fc
Author: Noel Grandin <noel at peralex.com>
Date: Fri May 29 09:59:20 2015 +0200
loplugin:loopvartoosmall
Change-Id: I86ff38a90018a2ddfb2db3babf67168b0e6257a5
diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx
index bba8854..adcc2c5 100644
--- a/compilerplugins/clang/loopvartoosmall.cxx
+++ b/compilerplugins/clang/loopvartoosmall.cxx
@@ -103,7 +103,7 @@ bool LoopVarTooSmall::VisitForStmt( const ForStmt* stmt )
if (qt1BitWidth < qt2BitWidth) {
report(
DiagnosticsEngine::Warning,
- "loop index type is smaller than length type. " + qt.getAsString() + " < " + qt2.getAsString(),
+ "loop index type is narrower than length type. " + qt.getAsString() + " < " + qt2.getAsString(),
stmt->getInit()->getLocStart())
<< stmt->getInit()->getSourceRange();
//stmt->getCond()->dump();
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index f7e5250..8b6be55 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -774,7 +774,7 @@ sal_uInt32 FlashExporter::ActionSummer(Reference< XShapes >& xShapes)
Reference< XShape > xShape2;
- for( sal_uInt16 nShape = 0; nShape < nShapeCount; nShape++ )
+ for( sal_uInt32 nShape = 0; nShape < nShapeCount; nShape++ )
{
xShapes->getByIndex( nShape ) >>= xShape2;
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 1cc70b9..926d012 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -2601,7 +2601,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode
}
}
mnCursorPos += nLen;
- for( sal_uInt16 n = 0UL; n < nLen; n++ )
+ for( sal_uLong n = 0; n < nLen; n++ )
{
if ( n == nLen - nCount )
{
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 1e73c13..206a546 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -701,7 +701,7 @@ void CGMImpressOutAct::DrawPolyPolygon( tools::PolyPolygon& rPolyPolygon )
drawing::PointSequence* pOuterSequence = aRetval.Coordinates.getArray();
drawing::FlagSequence* pOuterFlags = aRetval.Flags.getArray();
- for( sal_uInt16 a = 0; a < nNumPolys; a++ )
+ for( sal_uInt32 a = 0; a < nNumPolys; a++ )
{
Polygon aPolygon( rPolyPolygon.GetObject( a ) );
sal_uInt32 nNumPoints = aPolygon.GetSize();
@@ -714,7 +714,7 @@ void CGMImpressOutAct::DrawPolyPolygon( tools::PolyPolygon& rPolyPolygon )
awt::Point* pInnerSequence = pOuterSequence->getArray();
drawing::PolygonFlags* pInnerFlags = pOuterFlags->getArray();
- for( sal_uInt16 b = 0; b < nNumPoints; b++ )
+ for( sal_uInt32 b = 0; b < nNumPoints; b++ )
{
*pInnerSequence++ = awt::Point( aPolygon.GetPoint( b ).X(), aPolygon.GetPoint( b ).Y() ) ;
*pInnerFlags++ = (drawing::PolygonFlags)aPolygon.GetFlags( b );
diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx
index 68e47d8..4544a3f 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -127,7 +127,7 @@ void CGM::ImplDoClass4()
{
sal_uInt32 nPoints = mnElementSize / ImplGetPointSize();
Polygon aPolygon( (sal_uInt16)nPoints );
- for ( sal_uInt16 i = 0; i < nPoints; i++)
+ for ( sal_uInt32 i = 0; i < nPoints; i++)
{
FloatPoint aFloatPoint;
ImplGetPoint( aFloatPoint, true );
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 63cec8d..8902b4c 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1630,7 +1630,7 @@ ImplErrorDialog::~ImplErrorDialog()
void ImplErrorDialog::dispose()
{
// free strings again
- for( sal_uInt16 n = 0; n < m_pErrors->GetEntryCount(); n++ )
+ for( sal_Int32 n = 0; n < m_pErrors->GetEntryCount(); n++ )
delete static_cast<OUString*>(m_pErrors->GetEntryData( n ));
m_pErrors.clear();
m_pExplanation.clear();
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index a697793..cc24f50 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -1125,7 +1125,7 @@ bool SVGFilter::implGenerateMetaData()
}
}
// text fields are used only for generating meta info so we don't need them anymore
- for( sal_uInt32 i = 0; i < aFieldSet.size(); ++i )
+ for( size_t i = 0; i < aFieldSet.size(); ++i )
{
if( aFieldSet[i] != NULL )
{
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 4c5b9b0..8486336 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1650,7 +1650,7 @@ struct ShapeWritingVisitor
boost::bind(&basegfx::B2DPolyPolygon::transform,
_1,boost::cref(aState.maCTM)));
- for( sal_uInt32 i=0; i<aPolys.size(); ++i )
+ for( size_t i=0; i<aPolys.size(); ++i )
{
const basegfx::B2DRange aBounds(
aPolys[i].areControlPointsUsed() ?
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 986411f..66953bc 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2015,7 +2015,7 @@ void SVGActionWriter::ImplWriteShape( const SVGShapeDescriptor& rShape, bool bAp
const OUString aComma( "," );
OUString aDashArrayStr;
- for( unsigned int k = 0; k < rShape.maDashArray.size(); ++k )
+ for( size_t k = 0; k < rShape.maDashArray.size(); ++k )
{
const sal_Int32 nDash = ( bApplyMapping ?
ImplMap( FRound( rShape.maDashArray[ k ] ) ) :
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index c624390..890e901 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -610,7 +610,7 @@ namespace frm
pStr++;
}
aListSourceSeq.realloc( nTokens );
- for (sal_uInt16 i=0; i<nTokens; ++i)
+ for (sal_Int32 i=0; i<nTokens; ++i)
{
sal_Int32 nTmp = 0;
aListSourceSeq.getArray()[i] = sListSource.getToken(i,';',nTmp);
@@ -941,9 +941,9 @@ namespace frm
if(*aBoundColumn == -1)
{
// the type of i matters! It will be the type of the ORowSetValue pushed to aValueList!
- for(sal_Int16 i=0; static_cast<ValueList::size_type>(i) < aDisplayList.size(); ++i)
+ for(size_t i=0; i < aDisplayList.size(); ++i)
{
- aValueList.push_back(i);
+ aValueList.push_back(static_cast<connectivity::ORowSetValue >(i));
}
}
else
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 425593d..7fcb6bd 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -883,7 +883,7 @@ void FormulaDlg_Impl::FillControls(bool &rbNext, bool &rbPrev)
sal_Int32 nEditPos = pMEdit->GetSelection().Min();
bool bFlag = false;
- for(sal_uInt16 i=0;i<nArgs;i++)
+ for(sal_Int32 i=0;i<nArgs;i++)
{
sal_Int32 nLength = m_aArguments[i].getLength()+1;
pParaWin->SetArgument(i,m_aArguments[i]);
@@ -1180,7 +1180,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
m_aArguments[nEd] = pParaWin->GetArgument(nEd);
sal_uInt16 nClearPos=nEd+1;
- for(sal_uInt16 i=nEd+1; i<nArgs; i++)
+ for(sal_Int32 i=nEd+1; i<nArgs; i++)
{
if( !pParaWin->GetArgument(i).isEmpty() )
{
@@ -1188,7 +1188,7 @@ void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
}
}
- for(sal_uInt16 i=nClearPos; i<nArgs; i++)
+ for(sal_Int32 i=nClearPos; i<nArgs; i++)
{
m_aArguments[i].clear();
}
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 91b262f..e47321f 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -88,7 +88,7 @@ void FontMenuController::fillPopupMenu( const Sequence< OUString >& rFontNameSeq
{
vector<OUString> aVector;
aVector.reserve(rFontNameSeq.getLength());
- for ( sal_uInt16 i = 0; i < rFontNameSeq.getLength(); i++ )
+ for ( sal_Int32 i = 0; i < rFontNameSeq.getLength(); i++ )
{
aVector.push_back(MnemonicGenerator::EraseAllMnemonicChars(pFontNameArray[i]));
}
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 07f7d10..3b07bb7 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -660,7 +660,7 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
NameSet aDefaultsSet;
bool bCtypeIsRef = false;
- for (sal_Int16 i = 0; i< getNumberOfChildren() ; i++, formatCount++)
+ for (sal_Int32 i = 0; i< getNumberOfChildren() ; i++, formatCount++)
{
LocaleNode * currNode = getChildAt (i);
if ( currNode->getName() == "DateAcceptancePattern" )
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 82dc3f2..3c71270 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -669,7 +669,7 @@ Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems(
case REF_MONTHS:
case REF_GMONTHS:
case REF_PMONTHS:
- for (sal_Int16 j = 0; j < nSize; ++j, ++pItem)
+ for (sal_Int32 j = 0; j < nSize; ++j, ++pItem)
{
CalendarItem2 item( allCalendars[rnOffset], allCalendars[rnOffset+1],
allCalendars[rnOffset+2], allCalendars[rnOffset+3]);
@@ -679,7 +679,7 @@ Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems(
break;
case REF_ERAS:
// Absent narrow name.
- for (sal_Int16 j = 0; j < nSize; ++j, ++pItem)
+ for (sal_Int32 j = 0; j < nSize; ++j, ++pItem)
{
CalendarItem2 item( allCalendars[rnOffset], allCalendars[rnOffset+1],
allCalendars[rnOffset+2], OUString());
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index 4ff2f3e..782c633 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -222,7 +222,7 @@ TransliterationImpl::loadModuleNew( const Sequence < TransliterationModulesNew >
sal_Int32 mask = 0, count = modType.getLength();
if (count > maxCascade)
throw ERROR; // could not handle more than maxCascade
- for (sal_Int16 i = 0; i < count; i++) {
+ for (sal_Int32 i = 0; i < count; i++) {
for (sal_Int16 j = 0; TMlist[j].tmn; j++) {
if (TMlist[j].tmn == modType[i]) {
if (mask == 0)
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index f179bde..5513d56 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -126,7 +126,7 @@ OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData)
static bool hasOption(char const * szOption, int argc, char** argv)
{
bool retVal= false;
- for(sal_Int16 i= 1; i < argc; i++)
+ for(int i= 1; i < argc; i++)
{
if( ! strcmp(argv[i], szOption))
{
diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx
index 5fc7817..9a605b6 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.cxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.cxx
@@ -537,7 +537,7 @@ XFFrame* LwpDrawPolyLine::CreateDrawObj(const OUString& rStyleName )
XFDrawPath* pPolyline = new XFDrawPath();
pPolyline->MoveTo(XFPoint((double)m_pVector[0].x/TWIPS_PER_CM * m_pTransData->fScaleX,
(double)m_pVector[0].y/TWIPS_PER_CM * m_pTransData->fScaleY));
- for (sal_uInt8 nC = 1; nC < m_aPolyLineRec.nNumPoints; nC++)
+ for (sal_uInt16 nC = 1; nC < m_aPolyLineRec.nNumPoints; nC++)
{
pPolyline->LineTo(XFPoint((double)m_pVector[nC].x/TWIPS_PER_CM * m_pTransData->fScaleX,
(double)m_pVector[nC].y/TWIPS_PER_CM * m_pTransData->fScaleY));
@@ -552,7 +552,7 @@ XFFrame* LwpDrawPolyLine::CreateDrawObj(const OUString& rStyleName )
XFFrame* LwpDrawPolyLine::CreateStandardDrawObj(const OUString& rStyleName)
{
XFDrawPolyline* pPolyline = new XFDrawPolyline();
- for (sal_uInt8 nC = 0; nC < m_aPolyLineRec.nNumPoints; nC++)
+ for (sal_uInt16 nC = 0; nC < m_aPolyLineRec.nNumPoints; nC++)
{
pPolyline->AddPoint((double)m_pVector[nC].x/TWIPS_PER_CM,
(double)m_pVector[nC].y/TWIPS_PER_CM);
@@ -1169,7 +1169,7 @@ void LwpDrawTextArt::CreateFWPath(XFDrawPath* pPath)
pPath->MoveTo(aStart);
sal_uInt8 nPtIndex = 1;
- for (sal_uInt8 nC = 1; nC <= m_aTextArtRec.aPath[0].n; nC++)
+ for (sal_uInt16 nC = 1; nC <= m_aTextArtRec.aPath[0].n; nC++)
{
nX = (m_aTextArtRec.aPath[0].pPts[nPtIndex].x + m_aTextArtRec.aPath[1].pPts[nPtIndex].x) / 2;
nY = (m_aTextArtRec.aPath[0].pPts[nPtIndex].y + m_aTextArtRec.aPath[1].pPts[nPtIndex].y) / 2;
diff --git a/lotuswordpro/source/filter/lwpidxmgr.cxx b/lotuswordpro/source/filter/lwpidxmgr.cxx
index 07ea4a1..cba6cd85 100644
--- a/lotuswordpro/source/filter/lwpidxmgr.cxx
+++ b/lotuswordpro/source/filter/lwpidxmgr.cxx
@@ -288,14 +288,14 @@ void LwpIndexManager::ReadLeafData( LwpObjectStream *pObjStrm )
akey->id.Read(pObjStrm);
m_ObjectKeys.push_back(akey);
- for (sal_uInt8 k = 1; k < KeyCount; k++)
+ for (sal_uInt16 k = 1; k < KeyCount; k++)
{
akey = new LwpKey();
akey->id.ReadCompressed(pObjStrm, m_ObjectKeys.at(m_nKeyCount+k-1)->id);
m_ObjectKeys.push_back(akey);
}
- for (sal_uInt8 j = 0; j < KeyCount; j++)
+ for (sal_uInt16 j = 0; j < KeyCount; j++)
m_ObjectKeys.at(m_nKeyCount+j)->offset = pObjStrm->QuickReaduInt32();
}
m_nKeyCount += KeyCount;
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index e7bae0f..63eec38 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -309,7 +309,7 @@ sal_Int32 LwpRowLayout::FindMarkConnCell(sal_uInt8 nStartCol,sal_uInt8 nEndCol)
sal_uInt16 nSpannRows = 1;
sal_Int32 nMarkConnCell = -1;
- for (sal_uInt16 i=0;i<m_ConnCellList.size();i++)
+ for (size_t i=0;i<m_ConnCellList.size();i++)
{
if (m_ConnCellList[i]->GetColID()>=nEndCol)
break;
@@ -334,7 +334,7 @@ sal_Int32 LwpRowLayout::FindNextMarkConnCell(sal_uInt16 nMarkConnCell,sal_uInt8
{
sal_uInt16 nMaxRows = m_ConnCellList[nMarkConnCell]->GetNumrows();
- for (sal_uInt16 i=nMarkConnCell+1;i<m_ConnCellList.size();i++)
+ for (size_t i=nMarkConnCell+1;i<m_ConnCellList.size();i++)
{
if (m_ConnCellList[i]->GetColID()>=nEndCol)
break;
@@ -446,7 +446,7 @@ void LwpRowLayout::CollectMergeInfo()
void LwpRowLayout::SetCellSplit(sal_uInt16 nEffectRows)
{
LwpConnectedCellLayout* pConnCell;
- for (sal_uInt32 i=0; i<m_ConnCellList.size(); i++)
+ for (size_t i=0; i<m_ConnCellList.size(); i++)
{
pConnCell = m_ConnCellList[i];
sal_uInt16 nRowSpan = pConnCell->GetRowID()+pConnCell->GetNumrows();
diff --git a/lotuswordpro/source/filter/lwpsilverbullet.cxx b/lotuswordpro/source/filter/lwpsilverbullet.cxx
index c0c39e9..89da8d7 100644
--- a/lotuswordpro/source/filter/lwpsilverbullet.cxx
+++ b/lotuswordpro/source/filter/lwpsilverbullet.cxx
@@ -97,7 +97,7 @@ void LwpSilverBullet::Read()
sal_uInt16 nNumPos = m_pObjStrm->QuickReaduInt16();
- for (sal_uInt8 nC = 0; nC < nNumPos; nC++)
+ for (sal_uInt16 nC = 0; nC < nNumPos; nC++)
m_pResetPositionFlags[nC] = m_pObjStrm->QuickReaduInt8();
m_nUseCount = m_pObjStrm->QuickReaduInt32();
diff --git a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
index a4e3680..8f19d4a 100644
--- a/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
+++ b/lotuswordpro/source/filter/xfilter/xfinputlist.hxx
@@ -97,7 +97,7 @@ inline void XFInputList::ToXml(IXFStream *pStrm)
pAttrList->AddAttribute( "text:value", " " );
pStrm->StartElement( "text:label" );
pStrm->EndElement( "text:label" );
- for(sal_uInt32 i=0; i< m_list.size();i++)
+ for(size_t i=0; i< m_list.size();i++)
{
pAttrList->Clear();
pAttrList->AddAttribute( "text:value", m_list[i] );
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 9376ab0..7c0bbde 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -417,7 +417,7 @@ OUString ManifestImport::PushNameAndNamespaces( const OUString& aName, const uno
aStack.push_back( ManifestScopeEntry( aConvertedName, aNamespaces ) );
- for ( sal_uInt16 nInd = 0; nInd < aAttribsStrs.size(); nInd++ )
+ for ( size_t nInd = 0; nInd < aAttribsStrs.size(); nInd++ )
{
// convert the attribute names on filling
o_aConvertedAttribs[ConvertName( aAttribsStrs[nInd].first )] = aAttribsStrs[nInd].second;
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index c94cba6..a0fa26b 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -1229,7 +1229,7 @@ void SAL_CALL ZipPackageStream::setPropertyValue( const OUString& aPropertyName,
Sequence < sal_Int8 > aSequence ( nPathLength );
sal_Int8 *pArray = aSequence.getArray();
const sal_Unicode *pChar = sTempString.getStr();
- for ( sal_Int16 i = 0; i < nPathLength; i++ )
+ for ( sal_Int32 i = 0; i < nPathLength; i++ )
pArray[i] = static_cast < const sal_Int8 > ( pChar[i] );
aNewKey = aSequence;
}
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index 7b8e4cb..5fe2ef3 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -306,7 +306,7 @@ namespace svgio
::std::vector< double > aExtendArray(aTextLayouterDevice.getTextArray(getText(), nArray, nLength - nArray));
aTextArray.reserve(nLength);
- for(sal_uInt32 a(0); a < aExtendArray.size(); a++)
+ for(size_t a(0); a < aExtendArray.size(); a++)
{
aTextArray.push_back(aExtendArray[a] + fStartX);
}
@@ -331,7 +331,7 @@ namespace svgio
aTextArray = aTextLayouterDevice.getTextArray(getText(), nIndex, nLength);
}
- for(sal_uInt32 a(0); a < aTextArray.size(); a++)
+ for(size_t a(0); a < aTextArray.size(); a++)
{
aTextArray[a] *= fFactor;
}
@@ -615,7 +615,7 @@ namespace svgio
{
const double fFactor(F_PI / 180.0);
- for(sal_uInt32 a(0); a < maRotate.size(); a++)
+ for(size_t a(0); a < maRotate.size(); a++)
{
maRotate[a] *= fFactor;
}
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index 3066fc0..9e5b31a 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -108,7 +108,7 @@ namespace svgio
}
}
- for(sal_uInt32 a(0); a < aParts.size(); a++)
+ for(size_t a(0); a < aParts.size(); a++)
{
const OUString aNewConcatenated(
"." + aParts[a] + aConcatenated);
@@ -238,7 +238,7 @@ namespace svgio
// as current
SvgStyleAttributes* pCurrent = const_cast< SvgStyleAttributes* >(maCssStyleVector[0]);
- for(sal_uInt32 a(1); a < maCssStyleVector.size(); a++)
+ for(size_t a(1); a < maCssStyleVector.size(); a++)
{
SvgStyleAttributes* pNext = const_cast< SvgStyleAttributes* >(maCssStyleVector[a]);
diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx
index ab9fa02..42cc554 100644
--- a/svgio/source/svgreader/svgstylenode.cxx
+++ b/svgio/source/svgreader/svgstylenode.cxx
@@ -117,7 +117,7 @@ namespace svgio
OUString aConcatenatedSelector;
// re-combine without spaces, create a unique name (for now)
- for(sal_uInt32 a(0); a < aSelectorParts.size(); a++)
+ for(size_t a(0); a < aSelectorParts.size(); a++)
{
aConcatenatedSelector += aSelectorParts[a];
}
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 63c0f74..4aa1b02 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -2821,7 +2821,7 @@ void SAL_CALL
shell::notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* >* listeners_vec )
{
std::list< ContentEventNotifier* >* listeners;
- for( sal_uInt32 i = 0; i < listeners_vec->size(); ++i )
+ for( size_t i = 0; i < listeners_vec->size(); ++i )
{
listeners = (*listeners_vec)[i];
std::list< ContentEventNotifier* >::iterator it = listeners->begin();
More information about the Libreoffice-commits
mailing list