helpcontent2 | 2 +- oox/source/drawingml/fillproperties.cxx | 10 +++++----- xmloff/source/style/prstylei.cxx | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
New commits: commit 42b9fa4afeabc2daaba2349ee24d4c426a032f03 Author: Julien Nabet <serval2...@yahoo.fr> Date: Sun Jul 20 09:46:24 2014 +0200 cppcheck: Prefer prefix ++/-- operators Change-Id: If9fa06958c4ebb45a5d4acf3b2994dd3b79f81bf diff --git a/helpcontent2 b/helpcontent2 index a8c8f80..4afc42f 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a8c8f80b933a42a284e681c1d1973166445a4451 +Subproject commit 4afc42f9eb3f50b542f22414045856bfc588855e diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index fb02bda..83ab6a4 100644 --- a/oox/source/drawingml/fillproperties.cxx +++ b/oox/source/drawingml/fillproperties.cxx @@ -402,7 +402,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, bSymmetric = false; else { - aItA++; + ++aItA; aItZ = boost::prior(aItZ); } } @@ -430,7 +430,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, ", number of stops: " << aGradientStops.size()); for (GradientFillProperties::GradientStopMap::iterator p(aGradientStops.begin()); p != aGradientStops.end(); - p++) + ++p) SAL_INFO("oox.drawingml.gradient", " " << std::distance(aGradientStops.begin(), p) << ": " << p->first << ": " << std::hex << p->second.getColor( rGraphicHelper, nPhClr ) << std::dec << @@ -443,7 +443,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, GradientFillProperties::GradientStopMap::iterator aIt(aGradientStops.begin()); double nWidestWidth = -1; GradientFillProperties::GradientStopMap::iterator aWidestSegmentStart; - aIt++; + ++aIt; while( aIt != aGradientStops.end() ) { if( aIt->first - boost::prior(aIt)->first > nWidestWidth ) @@ -451,7 +451,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, nWidestWidth = aIt->first - boost::prior(aIt)->first; aWidestSegmentStart = boost::prior(aIt); } - aIt++; + ++aIt; } assert( nWidestWidth > 0 ); @@ -515,7 +515,7 @@ void FillProperties::pushToPropMap( ShapePropertyMap& rPropMap, nWidestWidth = aIt->first - boost::prior(aIt)->first; aWidestSegmentStart = boost::prior(aIt); } - aIt++; + ++aIt; } } SAL_INFO("oox.drawingml.gradient", "widest segment start: " << aWidestSegmentStart->first << ", border: " << nBorder); diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx index 97019d3..3dfbb37 100644 --- a/xmloff/source/style/prstylei.cxx +++ b/xmloff/source/style/prstylei.cxx @@ -519,7 +519,7 @@ bool XMLPropStyleContext::doNewDrawingLayerFillStyleDefinitionsExist( if(rMapper.is()) { - for(::std::vector< XMLPropertyState >::const_iterator a = maProperties.begin(); a != maProperties.end(); a++) + for(::std::vector< XMLPropertyState >::const_iterator a = maProperties.begin(); a != maProperties.end(); ++a) { if(a->mnIndex != -1) { @@ -567,7 +567,7 @@ bool XMLPropStyleContext::deactivateOldFillStyleDefinitions( if(rMapper.is()) { - for(::std::vector< XMLPropertyState >::iterator a = maProperties.begin(); a != maProperties.end(); a++) + for(::std::vector< XMLPropertyState >::iterator a = maProperties.begin(); a != maProperties.end(); ++a) { if(a->mnIndex != -1) { @@ -603,7 +603,7 @@ bool XMLPropStyleContext::translateNameBasedDrawingLayerFillStyleDefinitionsToSt static OUString s_FillBitmapName(RTL_CONSTASCII_USTRINGPARAM("FillBitmapName")); static OUString s_FillTransparenceGradientName(RTL_CONSTASCII_USTRINGPARAM("FillTransparenceGradientName")); - for(::std::vector< XMLPropertyState >::iterator a = maProperties.begin(); a != maProperties.end(); a++) + for(::std::vector< XMLPropertyState >::iterator a = maProperties.begin(); a != maProperties.end(); ++a) { if(a->mnIndex != -1) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits