svx/source/table/tablerow.cxx | 4 ++-- vcl/source/gdi/pngwrite.cxx | 2 +- writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 7 +++---- xmloff/source/chart/SchXMLSeriesHelper.cxx | 5 +++-- xmloff/source/table/XMLTableExport.cxx | 4 +++- 5 files changed, 12 insertions(+), 10 deletions(-)
New commits: commit 25e5d697bca38e4ac8aa6a7a9030ffbf36682cac Author: Julien Nabet <serval2...@yahoo.fr> Date: Mon Apr 1 20:21:48 2013 +0200 Prefer prefix ++/-- operators for non-primitive types Change-Id: If5950affaff1537362b1e5c2e3791d04c5371306 diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx index 8d9a992..fcd4211 100644 --- a/vcl/source/gdi/pngwrite.cxx +++ b/vcl/source/gdi/pngwrite.cxx @@ -258,7 +258,7 @@ sal_Bool PNGWriterImpl::Write( SvStream& rOStm ) if ( nDataSize ) rOStm.Write( &aBeg->aData[ 0 ], nDataSize ); rOStm << nCRC; - aBeg++; + ++aBeg; } rOStm.SetNumberFormatInt( nOldMode ); return mbStatus; diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 5865846..81ac271 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -2256,14 +2256,13 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext debug_logger->startElement("Wrapper-createChildContext"); debug_logger->attribute("token", fastTokenToId(Element)); - set<Id>::const_iterator aIt(mMyNamespaces.begin()); - while (aIt != mMyNamespaces.end()) + const set<Id>::const_iterator aEnd(mMyNamespaces.end()); + for (set<Id>::const_iterator aIt(mMyNamespaces.begin()); + aIt != aEnd; ++aIt) { debug_logger->startElement("namespace"); debug_logger->attribute("id", fastTokenToId(*aIt)); debug_logger->endElement(); - - aIt++; } debug_logger->endElement(); diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx index c50ac86..b6b7a66 100644 --- a/xmloff/source/chart/SchXMLSeriesHelper.cxx +++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx @@ -83,9 +83,10 @@ using ::com::sun::star::uno::Sequence; sal_Int32 nIndex=0; ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( SchXMLSeriesHelper::getDataSeriesFromDiagram( xDiagram )); + const ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aSeriesEnd( aSeriesVector.end() ); for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() ) - ; aSeriesIt != aSeriesVector.end() - ; aSeriesIt++, nIndex++ ) + ; aSeriesIt != aSeriesEnd + ; ++aSeriesIt, nIndex++ ) { Reference< chart2::XDataSeries > xSeries( *aSeriesIt ); if( xSeries.is() ) diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index b06df84..5be12e5 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -120,7 +120,9 @@ void StringStatisticHelper::add( const OUString& rStyleName ) sal_Int32 StringStatisticHelper::getModeString( OUString& rStyleName ) { sal_Int32 nMax = 0; - for( std::map< OUString, sal_Int32 >::iterator iter( begin() ); iter != end(); iter++ ) + const std::map< OUString, sal_Int32 >::const_iterator aEnd( end() ); + for( std::map< OUString, sal_Int32 >::iterator iter( begin() ); + iter != aEnd; ++iter) { if( (*iter).second > nMax ) { commit 85a499d50fe17ff19b43f5a69b9c809ace18401e Author: Julien Nabet <serval2...@yahoo.fr> Date: Mon Apr 1 19:10:51 2013 +0200 Prefer prefix ++/-- operators for non-primitive types Change-Id: I9fc8adf31c269db33d0d9806e182748ec082c1e3 diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 03208ab..ab164dd 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -141,13 +141,13 @@ void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount ) { CellVector::iterator aBegin( maCells.begin() ); while( nIndex-- && (aBegin != maCells.end()) ) - aBegin++; + ++aBegin; if( nCount > 1 ) { CellVector::iterator aEnd( aBegin ); while( nCount-- && (aEnd != maCells.end()) ) - aEnd++; + ++aEnd; maCells.erase( aBegin, aEnd ); } else _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits