Kaydet (Commit) e511a7d6 authored tarafından Julien Nabet's avatar Julien Nabet

Fixes a bunch of "Prefer prefix ++/-- operators for non-primitive types"

üst 7c9e637b
...@@ -313,7 +313,7 @@ void TickFactory_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo ...@@ -313,7 +313,7 @@ void TickFactory_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo
//get the transformed screen values for all tickmarks in rAllTickInfos //get the transformed screen values for all tickmarks in rAllTickInfos
::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = rAllTickInfos.begin(); ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = rAllTickInfos.begin();
const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rAllTickInfos.end(); 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(); ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
......
...@@ -227,7 +227,7 @@ void VAxisBase::removeTextShapesFromTicks() ...@@ -227,7 +227,7 @@ void VAxisBase::removeTextShapesFromTicks()
{ {
::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin(); ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin();
const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = m_aAllTickInfos.end(); 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(); ::std::vector< TickInfo >::iterator aTickIter = (*aDepthIter).begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end(); const ::std::vector< TickInfo >::const_iterator aTickEnd = (*aDepthIter).end();
......
...@@ -1467,7 +1467,7 @@ void VCartesianAxis::updatePositions() ...@@ -1467,7 +1467,7 @@ void VCartesianAxis::updatePositions()
::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin(); ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = m_aAllTickInfos.begin();
const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = m_aAllTickInfos.end(); 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(); ::std::vector< TickInfo >::iterator aTickIter = aDepthIter->begin();
const ::std::vector< TickInfo >::const_iterator aTickEnd = aDepthIter->end(); const ::std::vector< TickInfo >::const_iterator aTickEnd = aDepthIter->end();
...@@ -1589,7 +1589,7 @@ void VCartesianAxis::createShapes() ...@@ -1589,7 +1589,7 @@ void VCartesianAxis::createShapes()
sal_Int32 nTickmarkPropertiesCount = aTickmarkPropertiesList.size(); sal_Int32 nTickmarkPropertiesCount = aTickmarkPropertiesList.size();
::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = aComplexTickInfos.begin(); ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = aComplexTickInfos.begin();
const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = aComplexTickInfos.end(); 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) if(nDepth==0 && !m_aAxisProperties.m_nMajorTickmarks)
continue; continue;
...@@ -1614,7 +1614,7 @@ void VCartesianAxis::createShapes() ...@@ -1614,7 +1614,7 @@ void VCartesianAxis::createShapes()
return; return;
sal_Int32 nTickmarkPropertiesCount = m_aAxisProperties.m_aTickmarkPropertiesList.size(); 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*/ ); createTickMarkLineShapes( *aDepthIter, m_aAxisProperties.m_aTickmarkPropertiesList[nDepth], *pTickFactory2D, false /*bOnlyAtLabels*/ );
} }
//----------------------------------------- //-----------------------------------------
......
...@@ -246,7 +246,7 @@ void VCartesianGrid::createShapes() ...@@ -246,7 +246,7 @@ void VCartesianGrid::createShapes()
sal_Int32 nLinePropertiesCount = aLinePropertiesList.size(); sal_Int32 nLinePropertiesCount = aLinePropertiesList.size();
for( sal_Int32 nDepth=0 for( sal_Int32 nDepth=0
; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount
; aDepthIter++, nDepth++ ) ; ++aDepthIter, nDepth++ )
{ {
if( !aLinePropertiesList[nDepth].isLineVisible() ) if( !aLinePropertiesList[nDepth].isLineVisible() )
continue; continue;
......
...@@ -188,7 +188,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic ...@@ -188,7 +188,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic
const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rRadiusTickInfos.end(); const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = rRadiusTickInfos.end();
for( sal_Int32 nDepth=0 for( sal_Int32 nDepth=0
; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount
; aDepthIter++, nDepth++ ) ; ++aDepthIter, nDepth++ )
{ {
if( !rLinePropertiesList[nDepth].isLineVisible() ) if( !rLinePropertiesList[nDepth].isLineVisible() )
continue; continue;
......
...@@ -468,7 +468,7 @@ void BarChart::createShapes() ...@@ -468,7 +468,7 @@ void BarChart::createShapes()
//sum up the values for all series in a complete z zlot per attached axis //sum up the values for all series in a complete z zlot per attached axis
::std::map< sal_Int32, double > aLogicYSumMap; ::std::map< sal_Int32, double > aLogicYSumMap;
for( ; aZSlotIter != aZSlotEnd; aZSlotIter++ ) for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{ {
::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
...@@ -492,7 +492,7 @@ void BarChart::createShapes() ...@@ -492,7 +492,7 @@ void BarChart::createShapes()
//============================================================================= //=============================================================================
aZSlotIter = m_aZSlots.begin(); 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(); ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
...@@ -869,7 +869,7 @@ void BarChart::createShapes() ...@@ -869,7 +869,7 @@ void BarChart::createShapes()
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); 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(); ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
......
...@@ -89,7 +89,7 @@ void BubbleChart::calculateMaximumLogicBubbleSize() ...@@ -89,7 +89,7 @@ void BubbleChart::calculateMaximumLogicBubbleSize()
{ {
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); 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(); ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
...@@ -248,7 +248,7 @@ void BubbleChart::createShapes() ...@@ -248,7 +248,7 @@ void BubbleChart::createShapes()
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
aZSlotIter = m_aZSlots.begin(); 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(); ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
......
...@@ -184,7 +184,7 @@ void CandleStickChart::createShapes() ...@@ -184,7 +184,7 @@ void CandleStickChart::createShapes()
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); 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(); ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
......
...@@ -167,7 +167,7 @@ VSeriesPlotter::~VSeriesPlotter() ...@@ -167,7 +167,7 @@ VSeriesPlotter::~VSeriesPlotter()
//delete all data series help objects: //delete all data series help objects:
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); 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(); ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
...@@ -282,7 +282,7 @@ void VSeriesPlotter::releaseShapes() ...@@ -282,7 +282,7 @@ void VSeriesPlotter::releaseShapes()
{ {
::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); 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(); ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
...@@ -1379,7 +1379,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu ...@@ -1379,7 +1379,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin(); ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); 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(); ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
......
...@@ -235,7 +235,7 @@ void EmbeddedObjectContainer::CloseEmbeddedObjects() ...@@ -235,7 +235,7 @@ void EmbeddedObjectContainer::CloseEmbeddedObjects()
} }
} }
aIt++; ++aIt;
} }
} }
...@@ -290,7 +290,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < embe ...@@ -290,7 +290,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < embe
if ( (*aIt).second == xObj ) if ( (*aIt).second == xObj )
return sal_True; return sal_True;
else else
aIt++; ++aIt;
} }
return sal_False; return sal_False;
...@@ -313,7 +313,7 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU ...@@ -313,7 +313,7 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU
if ( (*aIt).second == xObj ) if ( (*aIt).second == xObj )
return (*aIt).first; return (*aIt).first;
else else
aIt++; ++aIt;
} }
OSL_FAIL( "Unknown object!" ); OSL_FAIL( "Unknown object!" );
...@@ -498,7 +498,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re ...@@ -498,7 +498,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re
break; break;
} }
else else
aIt++; ++aIt;
} }
} }
} }
...@@ -905,7 +905,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r ...@@ -905,7 +905,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r
break; break;
} }
aIt++; ++aIt;
} }
OSL_ENSURE( bRet, "Object not found for removal!" ); OSL_ENSURE( bRet, "Object not found for removal!" );
...@@ -1107,7 +1107,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e ...@@ -1107,7 +1107,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e
break; break;
} }
aIt++; ++aIt;
} }
OSL_ENSURE( bFound, "Object not found for removal!" ); OSL_ENSURE( bFound, "Object not found for removal!" );
...@@ -1154,7 +1154,7 @@ sal_Bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < em ...@@ -1154,7 +1154,7 @@ sal_Bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < em
break; break;
} }
aIt++; ++aIt;
} }
if ( bFound ) if ( bFound )
...@@ -1221,7 +1221,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c ...@@ -1221,7 +1221,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c
break; break;
} }
aIt++; ++aIt;
} }
// try to load it from the container storage // try to load it from the container storage
......
...@@ -282,7 +282,7 @@ namespace connectivity ...@@ -282,7 +282,7 @@ namespace connectivity
sal_Int32 i=0; sal_Int32 i=0;
for(ProfileList::iterator itor=m_Product.mProfileList.begin(); for(ProfileList::iterator itor=m_Product.mProfileList.begin();
itor != m_Product.mProfileList.end(); itor != m_Product.mProfileList.end();
itor++) ++itor)
{ {
ProfileStruct * aProfile = (*itor).second; ProfileStruct * aProfile = (*itor).second;
list[i] = aProfile->getProfileName(); list[i] = aProfile->getProfileName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment