Use for-range loops in chart2 (part1)

Change-Id: I9310a6dc79d47f9058df8a3b463667389af1b2cb
Reviewed-on: https://gerrit.libreoffice.org/50672
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

5 files changed, 45 insertions, 72 deletions

diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index ecde1f639144..32c7ce3608bc 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -298,19 +298,18 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
             {
                 sal_Int32 nMaxFreq = 0;
                 // find most frequent key
-                for( tNumberformatFrequency::const_iterator aIt = aKeyMap.begin();
-                    aIt != aKeyMap.end(); ++aIt )
+                for (auto const& elem : aKeyMap)
                 {
                     SAL_INFO(
                         "chart2.tools",
-                        "NumberFormatKey " << (*aIt).first << " appears "
-                            << (*aIt).second << " times");
+                        "NumberFormatKey " << elem.first << " appears "
+                            << elem.second << " times");
                     // all values must at least be 1
-                    if( (*aIt).second > nMaxFreq )
+                    if( elem.second > nMaxFreq )
                     {
-                        nNumberFormatKey = (*aIt).first;
+                        nNumberFormatKey = elem.first;
                         bNumberFormatKeyFoundViaAttachedData = true;
-                        nMaxFreq = (*aIt).second;
+                        nMaxFreq = elem.second;
                     }
                 }
             }
@@ -510,10 +509,9 @@ void AxisHelper::hideAxisIfNoDataIsAttached( const Reference< XAxis >& xAxis, co
     //axis is hidden if no data is attached anymore but data is available
     bool bOtherSeriesAttachedToThisAxis = false;
     std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
-    std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin();
-    for( ; aIt != aSeriesVector.end(); ++aIt)
+    for (auto const& series : aSeriesVector)
     {
-        uno::Reference< chart2::XAxis > xCurrentAxis( DiagramHelper::getAttachedAxis( *aIt, xDiagram ), uno::UNO_QUERY );
+        uno::Reference< chart2::XAxis > xCurrentAxis( DiagramHelper::getAttachedAxis(series, xDiagram ), uno::UNO_QUERY );
         if( xCurrentAxis==xAxis )
         {
             bOtherSeriesAttachedToThisAxis = true;
@@ -1151,13 +1149,12 @@ Reference< XChartType > AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisInd
 {
     Reference< XChartType > xChartType;
     std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
-    std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
-    for( ; aIter != aSeriesVector.end(); ++aIter )
+    for (auto const& series : aSeriesVector)
     {
-        sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
+        sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex(series);
         if( nAttachedAxisIndex == nCurrentIndex )
         {
-            xChartType = DiagramHelper::getChartTypeOfSeries( xDiagram, *aIter );
+            xChartType = DiagramHelper::getChartTypeOfSeries(xDiagram, series);
             if(xChartType.is())
                 break;
         }
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index d946b3f9a62c..e05c014cddce 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -422,12 +422,10 @@ void setStackModeAtSeries(
             aAxisIndexSet.insert(0);
         }
 
-        for( std::set< sal_Int32 >::const_iterator aIt = aAxisIndexSet.begin();
-            aIt != aAxisIndexSet.end(); ++aIt )
+        for (auto const& axisIndex : aAxisIndexSet)
         {
-            sal_Int32 nAxisIndex = *aIt;
             Reference< chart2::XAxis > xAxis(
-                xCorrespondingCoordinateSystem->getAxisByDimension( 1, nAxisIndex ));
+                xCorrespondingCoordinateSystem->getAxisByDimension(1, axisIndex));
             if( xAxis.is())
             {
                 bool bPercent = (eStackMode == StackMode::YStackedPercent);
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 768b75c7ca3c..4f649239caa0 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -269,12 +269,11 @@ uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
             lcl_addRanges( aResult, xCategories );
 
         std::vector< uno::Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
-        for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
-                 ; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
+        for (auto const& series : aSeriesVector)
         {
-            uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
+            uno::Reference< data::XDataSource > xDataSource(series, uno::UNO_QUERY);
             lcl_addDataSourceRanges( aResult, xDataSource );
-            lcl_addErrorBarRanges( aResult, *aSeriesIt );
+            lcl_addErrorBarRanges( aResult, series );
         }
     }
 
@@ -304,10 +303,9 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
         aResult.push_back( xCategories );
 
     std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartModel ) );
-    for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
-        ; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
+    for (auto const& series : aSeriesVector)
     {
-        uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
+        uno::Reference< data::XDataSource > xDataSource(series, uno::UNO_QUERY);
         if( !xDataSource.is() )
             continue;
         uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
@@ -330,10 +328,9 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
         aResult.push_back( xCategories );
 
     std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( rModel ) );
-    for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
-        ; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
+    for (auto const& series : aSeriesVector)
     {
-        uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
+        uno::Reference< data::XDataSource > xDataSource(series, uno::UNO_QUERY);
         if( !xDataSource.is() )
             continue;
         uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 5d1c3e7c6a90..0b710adac5b3 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -860,12 +860,9 @@ void DiagramHelper::setCategoriesToDiagram(
     std::vector< Reference< chart2::XAxis > > aCatAxes(
         lcl_getAxisHoldingCategoriesFromDiagram( xDiagram ));
 
-    std::vector< Reference< chart2::XAxis > >::iterator aIt( aCatAxes.begin() );
-    std::vector< Reference< chart2::XAxis > >::const_iterator aEnd( aCatAxes.end() );
-
-    for( aIt = aCatAxes.begin(); aIt != aEnd; ++aIt )
+    for (auto const& elem : aCatAxes)
     {
-        Reference< chart2::XAxis > xCatAxis(*aIt);
+        Reference< chart2::XAxis > xCatAxis(elem);
         if( xCatAxis.is())
         {
             ScaleData aScaleData( xCatAxis->getScaleData());
@@ -892,12 +889,10 @@ Reference< data::XLabeledDataSequence >
     {
         std::vector< Reference< chart2::XAxis > > aCatAxes(
             lcl_getAxisHoldingCategoriesFromDiagram( xDiagram ));
-        std::vector< Reference< chart2::XAxis > >::iterator aIt( aCatAxes.begin() );
-        std::vector< Reference< chart2::XAxis > >::const_iterator aEnd( aCatAxes.end() );
         //search for first categories
-        if( aIt != aEnd )
+        if (!aCatAxes.empty())
         {
-            Reference< chart2::XAxis > xCatAxis(*aIt);
+            Reference< chart2::XAxis > xCatAxis(aCatAxes[0]);
             if( xCatAxis.is())
             {
                 ScaleData aScaleData( xCatAxis->getScaleData());
@@ -1505,13 +1500,12 @@ sal_Int32 DiagramHelper::getGeometry3D(
     if( aSeriesVec.empty())
         rbAmbiguous = true;
 
-    for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
-             aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
+    for (auto const& series : aSeriesVec)
     {
         try
         {
             sal_Int32 nGeom = 0;
-            Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY_THROW );
+            Reference< beans::XPropertySet > xProp(series, uno::UNO_QUERY_THROW);
             if( xProp->getPropertyValue( "Geometry3D") >>= nGeom )
             {
                 if( ! rbFound )
@@ -1544,11 +1538,10 @@ void DiagramHelper::setGeometry3D(
     std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
         DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
 
-    for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
-             aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
+    for (auto const& series : aSeriesVec)
     {
         DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(
-            *aIt, "Geometry3D", uno::Any( nNewGeometry ));
+            series, "Geometry3D", uno::Any( nNewGeometry ));
     }
 }
 
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 443de9e233e2..0fb965d14706 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -153,13 +153,10 @@ sal_Int32 ExplicitCategoriesProvider::getCategoryLevelCount() const
 std::vector<sal_Int32> lcl_getLimitingBorders( const std::vector< ComplexCategory >& rComplexCategories )
 {
     std::vector<sal_Int32> aLimitingBorders;
-    std::vector< ComplexCategory >::const_iterator aIt( rComplexCategories.begin() );
-    std::vector< ComplexCategory >::const_iterator aEnd( rComplexCategories.end() );
     sal_Int32 nBorderIndex = 0; /*border below the index*/
-    for( ; aIt != aEnd; ++aIt )
+    for (auto const& complexCategory : rComplexCategories)
     {
-        ComplexCategory aComplexCategory(*aIt);
-        nBorderIndex += aComplexCategory.Count;
+        nBorderIndex += complexCategory.Count;
         aLimitingBorders.push_back(nBorderIndex);
     }
     return aLimitingBorders;
@@ -294,10 +291,8 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector(
 sal_Int32 lcl_getCategoryCount( std::vector< ComplexCategory >& rComplexCategories )
 {
     sal_Int32 nCount = 0;
-    std::vector< ComplexCategory >::const_iterator aIt( rComplexCategories.begin() );
-    std::vector< ComplexCategory >::const_iterator aEnd( rComplexCategories.end() );
-    for( ; aIt != aEnd; ++aIt )
-        nCount+=aIt->Count;
+    for (auto const& complexCategory : rComplexCategories)
+        nCount+=complexCategory.Count;
     return nCount;
 }
 
@@ -318,25 +313,22 @@ Sequence< OUString > lcl_getExplicitSimpleCategories(
             rSplitCategoriesProvider.getStringsForLevel(nL), aLimitingBorders, nL==(nLCount-1) ) );
     }
 
-    std::vector< std::vector< ComplexCategory > >::iterator aOuterIt( rComplexCats.begin() );
-    std::vector< std::vector< ComplexCategory > >::const_iterator aOuterEnd( rComplexCats.end() );
-
     //ensure that the category count is the same on each level
     sal_Int32 nMaxCategoryCount = 0;
     {
-        for( aOuterIt=rComplexCats.begin(); aOuterIt != aOuterEnd; ++aOuterIt )
+        for (auto & complexCat : rComplexCats)
         {
-            sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt );
+            sal_Int32 nCurrentCount = lcl_getCategoryCount(complexCat);
             nMaxCategoryCount = std::max( nCurrentCount, nMaxCategoryCount );
         }
-        for( aOuterIt=rComplexCats.begin(); aOuterIt != aOuterEnd; ++aOuterIt )
+        for (auto & complexCat : rComplexCats)
         {
-            if ( !aOuterIt->empty() )
+            if ( !complexCat.empty() )
             {
-                sal_Int32 nCurrentCount = lcl_getCategoryCount( *aOuterIt );
+                sal_Int32 nCurrentCount = lcl_getCategoryCount(complexCat);
                 if( nCurrentCount< nMaxCategoryCount )
                 {
-                    ComplexCategory& rComplexCategory = aOuterIt->back();
+                    ComplexCategory& rComplexCategory = complexCat.back();
                     rComplexCategory.Count += (nMaxCategoryCount-nCurrentCount);
                 }
             }
@@ -345,17 +337,14 @@ Sequence< OUString > lcl_getExplicitSimpleCategories(
 
     //create a list with an element for every index
     std::vector< std::vector< ComplexCategory > > aComplexCatsPerIndex;
-    for( aOuterIt=rComplexCats.begin() ; aOuterIt != aOuterEnd; ++aOuterIt )
+    for (auto const& complexCat : rComplexCats)
     {
         std::vector< ComplexCategory > aSingleLevel;
-        std::vector< ComplexCategory >::iterator aIt( aOuterIt->begin() );
-        std::vector< ComplexCategory >::const_iterator aEnd( aOuterIt->end() );
-        for( ; aIt != aEnd; ++aIt )
+        for (auto const& elem : complexCat)
         {
-            ComplexCategory aComplexCategory( *aIt );
-            sal_Int32 nCount = aComplexCategory.Count;
+            sal_Int32 nCount = elem.Count;
             while( nCount-- )
-                aSingleLevel.push_back(aComplexCategory);
+                aSingleLevel.push_back(elem);
         }
         aComplexCatsPerIndex.push_back( aSingleLevel );
     }
@@ -363,15 +352,14 @@ Sequence< OUString > lcl_getExplicitSimpleCategories(
     if(nMaxCategoryCount)
     {
         aRet.realloc(nMaxCategoryCount);
-        aOuterEnd = aComplexCatsPerIndex.end();
         for(sal_Int32 nN=0; nN<nMaxCategoryCount; nN++)
         {
             OUString aText;
-            for( aOuterIt=aComplexCatsPerIndex.begin() ; aOuterIt != aOuterEnd; ++aOuterIt )
+            for (auto const& complexCatPerIndex : aComplexCatsPerIndex)
             {
-                if ( static_cast<size_t>(nN) < aOuterIt->size() )
+                if ( static_cast<size_t>(nN) < complexCatPerIndex.size() )
                 {
-                    OUString aAddText = (*aOuterIt)[nN].Text;
+                    OUString aAddText = complexCatPerIndex[nN].Text;
                     if( !aAddText.isEmpty() )
                     {
                         if(!aText.isEmpty())