chart2/source/view/axes/Tickmarks.cxx | 2 - chart2/source/view/axes/VAxisBase.cxx | 2 - chart2/source/view/axes/VCartesianAxis.cxx | 6 +-- chart2/source/view/axes/VCartesianGrid.cxx | 2 - chart2/source/view/axes/VPolarGrid.cxx | 2 - chart2/source/view/charttypes/BarChart.cxx | 6 +-- chart2/source/view/charttypes/BubbleChart.cxx | 4 +- chart2/source/view/charttypes/CandleStickChart.cxx | 2 - chart2/source/view/charttypes/VSeriesPlotter.cxx | 6 +-- comphelper/source/container/embeddedobjectcontainer.cxx | 16 +++++----- connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 2 - 11 files changed, 25 insertions(+), 25 deletions(-)
New commits: commit e511a7d6390cdc0a24a33c2870a9d6bf6522267a Author: Julien Nabet <serval2...@yahoo.fr> Date: Thu Mar 29 23:55:24 2012 +0200 Fixes a bunch of "Prefer prefix ++/-- operators for non-primitive types" diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 0ac0d20..5ae14ef 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -313,7 +313,7 @@ void TickFactory_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo //get the transformed screen values for all tickmarks in rAllTickInfos ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = rAllTickInfos.begin(); const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rAllTickInfos.end(); - for( ; aDepthIter != aDepthEnd; aDepthIter++ ) + for( ; aDepthIter != aDepthEnd; ++aDepthIter ) { ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin(); const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 9f20430..66521da 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -227,7 +227,7 @@ void VAxisBase::removeTextShapesFromTicks() { ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin(); const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = m_aAllTickInfos.end(); - for( ; aDepthIter != aDepthEnd; aDepthIter++ ) + for( ; aDepthIter != aDepthEnd; ++aDepthIter ) { ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin(); const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index f56cae0..9ffd923 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1467,7 +1467,7 @@ void VCartesianAxis::updatePositions() ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin(); const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = m_aAllTickInfos.end(); - for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd; aDepthIter++, nDepth++ ) + for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd; ++aDepthIter, nDepth++ ) { ::std::vector< TickInfo >::iterator aTickIter = aDepthIter->begin(); const ::std::vector< TickInfo >::const_iterator aTickEnd = aDepthIter->end(); @@ -1589,7 +1589,7 @@ void VCartesianAxis::createShapes() sal_Int32 nTickmarkPropertiesCount = aTickmarkPropertiesList.size(); ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = aComplexTickInfos.begin(); const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = aComplexTickInfos.end(); - for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; aDepthIter++, nDepth++ ) + for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; ++aDepthIter, nDepth++ ) { if(nDepth==0 && !m_aAxisProperties.m_nMajorTickmarks) continue; @@ -1614,7 +1614,7 @@ void VCartesianAxis::createShapes() return; sal_Int32 nTickmarkPropertiesCount = m_aAxisProperties.m_aTickmarkPropertiesList.size(); - for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; aDepthIter++, nDepth++ ) + for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; ++aDepthIter, nDepth++ ) createTickMarkLineShapes( *aDepthIter, m_aAxisProperties.m_aTickmarkPropertiesList[nDepth], *pTickFactory2D, false /*bOnlyAtLabels*/ ); } //----------------------------------------- diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 362459d..fb1f05d 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -246,7 +246,7 @@ void VCartesianGrid::createShapes() sal_Int32 nLinePropertiesCount = aLinePropertiesList.size(); for( sal_Int32 nDepth=0 ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount - ; aDepthIter++, nDepth++ ) + ; ++aDepthIter, nDepth++ ) { if( !aLinePropertiesList[nDepth].isLineVisible() ) continue; diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 3e1390e..9711c02 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -188,7 +188,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rRadiusTickInfos.end(); for( sal_Int32 nDepth=0 ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount - ; aDepthIter++, nDepth++ ) + ; ++aDepthIter, nDepth++ ) { if( !rLinePropertiesList[nDepth].isLineVisible() ) continue; diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index b7dc757..232a0bf 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -468,7 +468,7 @@ void BarChart::createShapes() //sum up the values for all series in a complete z zlot per attached axis ::std::map< sal_Int32, double > aLogicYSumMap; - for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ ) + for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); @@ -492,7 +492,7 @@ void BarChart::createShapes() //============================================================================= aZSlotIter = m_aZSlots.begin(); - for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; aZSlotIter++, nZ++ ) + for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); @@ -869,7 +869,7 @@ void BarChart::createShapes() ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); //============================================================================= - for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; aZSlotIter++, nZ++ ) + for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index bdc34cf..9bd15a1 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -89,7 +89,7 @@ void BubbleChart::calculateMaximumLogicBubbleSize() { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); - for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ ) + for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); @@ -248,7 +248,7 @@ void BubbleChart::createShapes() const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); aZSlotIter = m_aZSlots.begin(); - for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; aZSlotIter++, nZ++ ) + for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 64bd816..9be7286 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -184,7 +184,7 @@ void CandleStickChart::createShapes() ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); //============================================================================= - for( sal_Int32 nZ=0; aZSlotIter != aZSlotEnd; aZSlotIter++, nZ++ ) + for( sal_Int32 nZ=0; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 4f7ee80..1c84ca0 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -167,7 +167,7 @@ VSeriesPlotter::~VSeriesPlotter() //delete all data series help objects: ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); - for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ ) + for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); @@ -282,7 +282,7 @@ void VSeriesPlotter::releaseShapes() { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); - for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ ) + for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); @@ -1379,7 +1379,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); - for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ ) + for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index c109372..ab70006 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -235,7 +235,7 @@ void EmbeddedObjectContainer::CloseEmbeddedObjects() } } - aIt++; + ++aIt; } } @@ -290,7 +290,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < embe if ( (*aIt).second == xObj ) return sal_True; else - aIt++; + ++aIt; } return sal_False; @@ -313,7 +313,7 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU if ( (*aIt).second == xObj ) return (*aIt).first; else - aIt++; + ++aIt; } OSL_FAIL( "Unknown object!" ); @@ -498,7 +498,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re break; } else - aIt++; + ++aIt; } } } @@ -905,7 +905,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r break; } - aIt++; + ++aIt; } OSL_ENSURE( bRet, "Object not found for removal!" ); @@ -1107,7 +1107,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e break; } - aIt++; + ++aIt; } OSL_ENSURE( bFound, "Object not found for removal!" ); @@ -1154,7 +1154,7 @@ sal_Bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < em break; } - aIt++; + ++aIt; } if ( bFound ) @@ -1221,7 +1221,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c break; } - aIt++; + ++aIt; } // try to load it from the container storage diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index 98a4a94..8f28db8 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -282,7 +282,7 @@ namespace connectivity sal_Int32 i=0; for(ProfileList::iterator itor=m_Product.mProfileList.begin(); itor != m_Product.mProfileList.end(); - itor++) + ++itor) { ProfileStruct * aProfile = (*itor).second; list[i] = aProfile->getProfileName(); _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits