From 01a87c102fe6bdaf3aa48a0ba17219e6e0983c4c Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 30 Aug 2011 23:11:44 +0200 Subject: Some cppcheck cleaning --- l10ntools/source/help/HelpLinker.cxx | 2 +- oox/source/drawingml/fillproperties.cxx | 2 +- package/source/zippackage/ZipPackage.cxx | 2 +- svx/source/svdraw/svdpage.cxx | 2 +- sw/source/filter/ww8/ww8scan.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx index b1d7c1c2e849..4889642bfa74 100644 --- a/l10ntools/source/help/HelpLinker.cxx +++ b/l10ntools/source/help/HelpLinker.cxx @@ -735,7 +735,7 @@ void HelpLinker::main( std::vector &args, bExtensionMode = false; helpFiles.clear(); - if (args.size() > 0 && args[0][0] == '@') + if ((!args.empty()) && args[0][0] == '@') { std::vector stringList; std::string strBuf; diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index 88e2949d4eab..bf9361260fc2 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -270,7 +270,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, GradientFillProperties::GradientStopMap::const_iterator aIt = maGradientProps.maGradientStops.begin(); // Try to find the axial median for(size_t i=0;isecond.hasColor() kind would be better than Color != API_RGB_WHITE if( aGradient.StartColor == aGradient.EndColor && diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index ed5f81ba592d..72b3ab3382db 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -1058,7 +1058,7 @@ void ZipPackage::WriteManifest( ZipOutputStream& aZipOut, const vector< uno::Seq sal_Int32 nInd = 0; for ( vector < uno::Sequence < PropertyValue > >::const_iterator aIter = aManList.begin(), aEnd = aManList.end(); aIter != aEnd; - aIter++, nInd++ ) + ++aIter, ++nInd ) { aManifestSequence[nInd] = ( *aIter ); } diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 70deda899fdf..dbd8a39f3031 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1351,7 +1351,7 @@ SdrPage::~SdrPage() // of page users. Therefore we have to use a copy of the list for the // iteration. ::sdr::PageUserVector aListCopy (maPageUsers.begin(), maPageUsers.end()); - for(::sdr::PageUserVector::iterator aIterator = aListCopy.begin(); aIterator != aListCopy.end(); aIterator++) + for(::sdr::PageUserVector::iterator aIterator = aListCopy.begin(); aIterator != aListCopy.end(); ++aIterator) { sdr::PageUser* pPageUser = *aIterator; DBG_ASSERT(pPageUser, "SdrPage::~SdrPage: corrupt PageUser list (!)"); diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index ac92dd268a09..964929bab740 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -6617,7 +6617,7 @@ bool WW8PLCF_HdFt::GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rSta aPLCF.SetIdx( nIdx ); // Lookup suitable CP aPLCF.Get( rStart, nEnd, pData ); rLen = nEnd - rStart; - aPLCF++; + ++aPLCF; return true; } -- cgit