chart2/source/view/charttypes/AreaChart.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
New commits: commit 8b80ce7bc5f69e7d71b5de40794677c35d8d0ad2 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Tue Oct 8 06:46:44 2013 +0200 prevent some implicit iterator conversions Change-Id: I2335acba43eaf5950dec17bf847da4b115737dfa diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index a534b81..d3af561 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits