diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-08 06:46:44 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-11-19 13:47:34 +0100 |
| commit | e79c706ddda21f850fe3c5a867bacf3982e5b112 (patch) | |
| tree | b65494fbdc9ec2f79011a5246adb7709960935b5 | |
| parent | 11699eb826a6477d9d785a1e864469933ba95c14 (diff) | |
prevent some implicit iterator conversions
Change-Id: I2335acba43eaf5950dec17bf847da4b115737dfa
| -rw-r--r-- | chart2/source/view/charttypes/AreaChart.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index a534b8152692..d3af561b9956 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -735,21 +735,21 @@ void AreaChart::createShapes() //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { - ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); - const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); + ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); + const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); std::map< sal_Int32, double > aLogicYSumMap;//one for each different nAttachedAxisIndex for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter ) { - ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); - const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); + ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); + const ::std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end(); //iterate through all x slots in this category to get 100percent sum for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { std::vector<VDataSeries*>& rSeriesList = aXSlotIter->m_aSeriesVector; - std::vector<VDataSeries*>::iterator aSeriesIter = rSeriesList.begin(); - const std::vector<VDataSeries*>::iterator aSeriesEnd = rSeriesList.end(); + std::vector<VDataSeries*>::iterator aSeriesIter = rSeriesList.begin(); + std::vector<VDataSeries*>::iterator aSeriesEnd = rSeriesList.end(); for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -779,15 +779,15 @@ void AreaChart::createShapes() aZSlotIter = m_aZSlots.begin(); 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(); + ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin(); + ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); //for the area chart there should be at most one x slot (no side by side stacking available) //attention different: xSlots are always interpreted as independent areas one behind the other: @todo this doesn't work why not??? for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX ) { - std::vector<VDataSeries*>& rSeriesList = aXSlotIter->m_aSeriesVector; - std::vector<VDataSeries*>::const_iterator aSeriesIter = rSeriesList.begin(); + const std::vector<VDataSeries*>& rSeriesList = aXSlotIter->m_aSeriesVector; + std::vector<VDataSeries*>::const_iterator aSeriesIter = rSeriesList.begin(); const std::vector<VDataSeries*>::const_iterator aSeriesEnd = rSeriesList.end(); std::map< sal_Int32, double > aLogicYForNextSeriesMap;//one for each different nAttachedAxisIndex |