diff options
| m--------- | helpcontent2 | 0 | ||||
| -rw-r--r-- | oox/source/drawingml/fillproperties.cxx | 10 | ||||
| -rw-r--r-- | xmloff/source/style/prstylei.cxx | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/helpcontent2 b/helpcontent2 -Subproject a8c8f80b933a42a284e681c1d1973166445a445 +Subproject 4afc42f9eb3f50b542f22414045856bfc588855 diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx index fb02bdac0a2d..83ab6a42c03e 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 97019d3ac38c..3dfbb37931bc 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) { |