Use const_iterator when possible (reportdesign)

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

2 files changed, 24 insertions, 24 deletions

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 29432d7dd673..59bdd04aebeb 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -179,17 +179,17 @@ namespace rptxml
 void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid)
 {
     ORptExport::TSectionsGrid::iterator aSectionIter = _rGrid.begin();
-    ORptExport::TSectionsGrid::iterator aSectionEnd = _rGrid.end();
+    ORptExport::TSectionsGrid::const_iterator aSectionEnd = _rGrid.end();
     for (;aSectionIter != aSectionEnd ; ++aSectionIter)
     {
         ORptExport::TGrid::iterator aRowIter = aSectionIter->second.begin();
-        ORptExport::TGrid::iterator aRowEnd = aSectionIter->second.end();
+        ORptExport::TGrid::const_iterator aRowEnd = aSectionIter->second.end();
         for (; aRowIter != aRowEnd; ++aRowIter)
         {
             if ( aRowIter->first )
             {
-                ::std::vector< ORptExport::TCell >::iterator aColIter = aRowIter->second.begin();
-                ::std::vector< ORptExport::TCell >::iterator aColEnd = aRowIter->second.end();
+                ::std::vector< ORptExport::TCell >::const_iterator aColIter = aRowIter->second.begin();
+                ::std::vector< ORptExport::TCell >::const_iterator aColEnd = aRowIter->second.end();
                 for (; aColIter != aColEnd; ++aColIter)
                 {
                     if ( aColIter->nRowSpan > 1 )
@@ -737,13 +737,13 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader
 void ORptExport::exportTableColumns(const Reference< XSection>& _xSection)
 {
     SvXMLElementExport aColumns(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, true, true);
-    TGridStyleMap::iterator aColFind = m_aColumnStyleNames.find(_xSection.get());
+    TGridStyleMap::const_iterator aColFind = m_aColumnStyleNames.find(_xSection.get());
     OSL_ENSURE(aColFind != m_aColumnStyleNames.end(),"ORptExport::exportTableColumns: Section not found in m_aColumnStyleNames!");
     if ( aColFind == m_aColumnStyleNames.end() )
         return;
 
-    TStringVec::iterator aColIter = aColFind->second.begin();
-    TStringVec::iterator aColEnd = aColFind->second.end();
+    TStringVec::const_iterator aColIter = aColFind->second.begin();
+    TStringVec::const_iterator aColEnd = aColFind->second.end();
     for (; aColIter != aColEnd; ++aColIter)
     {
         AddAttribute( m_sTableStyle,*aColIter );
@@ -757,16 +757,16 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
 
     exportTableColumns(_xSection);
 
-    TSectionsGrid::iterator aFind = m_aSectionsGrid.find(_xSection.get());
+    TSectionsGrid::const_iterator aFind = m_aSectionsGrid.find(_xSection.get());
     OSL_ENSURE(aFind != m_aSectionsGrid.end(),"ORptExport::exportContainer: Section not found in grid!");
     if ( aFind == m_aSectionsGrid.end() )
         return;
-    TGrid::iterator aRowIter = aFind->second.begin();
-    TGrid::iterator aRowEnd = aFind->second.end();
+    TGrid::const_iterator aRowIter = aFind->second.begin();
+    TGrid::const_iterator aRowEnd = aFind->second.end();
 
     sal_Int32 nEmptyCellColSpan = 0;
-    TGridStyleMap::iterator aRowFind = m_aRowStyleNames.find(_xSection.get());
-    TStringVec::iterator aHeightIter = aRowFind->second.begin();
+    TGridStyleMap::const_iterator aRowFind = m_aRowStyleNames.find(_xSection.get());
+    TStringVec::const_iterator aHeightIter = aRowFind->second.begin();
     OSL_ENSURE(aRowFind->second.size() == aFind->second.size(),"Different count for rows");
 
     bool bShapeHandled = false;
@@ -777,8 +777,8 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
         SvXMLElementExport aRow(*this,XML_NAMESPACE_TABLE, XML_TABLE_ROW, true, true);
         if ( aRowIter->first )
         {
-            ::std::vector< TCell >::iterator aColIter = aRowIter->second.begin();
-            ::std::vector< TCell >::iterator aColEnd = aRowIter->second.end();
+            ::std::vector< TCell >::const_iterator aColIter = aRowIter->second.begin();
+            ::std::vector< TCell >::const_iterator aColEnd = aRowIter->second.end();
             nEmptyCellColSpan = 0;
             for (; aColIter != aColEnd; ++aColIter)
             {
@@ -1016,7 +1016,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OU
 void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName)
 {
     Reference<XPropertySet> xFind(_xProp);
-    TPropertyStyleMap::iterator aFind = m_aAutoStyleNames.find(xFind);
+    TPropertyStyleMap::const_iterator aFind = m_aAutoStyleNames.find(xFind);
     if ( aFind != m_aAutoStyleNames.end() )
     {
         _rAtt.AddAttribute( _sName,
@@ -1068,7 +1068,7 @@ void ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinit
                         }
                         OUString sFormula("rpt:HASCHANGED(\"");
 
-                        TGroupFunctionMap::iterator aGroupFind = m_aGroupFunctionMap.find(xGroup);
+                        TGroupFunctionMap::const_iterator aGroupFind = m_aGroupFunctionMap.find(xGroup);
                         if ( aGroupFind != m_aGroupFunctionMap.end() )
                             sExpression = aGroupFind->second->getName();
                         sFormula += sExpression;
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index f3ef9ad8b702..f211e01872be 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -179,8 +179,8 @@ void OXMLTable::EndElement()
                 }
             }
             // set height
-            ::std::vector<sal_Int32>::iterator aIter = m_aHeight.begin();
-            ::std::vector<sal_Int32>::iterator aEnd = m_aHeight.end();
+            ::std::vector<sal_Int32>::const_iterator aIter = m_aHeight.begin();
+            ::std::vector<sal_Int32>::const_iterator aEnd = m_aHeight.end();
             sal_Int32 nHeight = 0;
             for (; aIter != aEnd; ++aIter)
                 nHeight += *aIter;
@@ -189,19 +189,19 @@ void OXMLTable::EndElement()
             sal_Int32 nLeftMargin = rptui::getStyleProperty<sal_Int32>(m_xSection->getReportDefinition(),PROPERTY_LEFTMARGIN);
             sal_Int32 nPosY = 0;
             ::std::vector< ::std::vector<TCell> >::iterator aRowIter = m_aGrid.begin();
-            ::std::vector< ::std::vector<TCell> >::iterator aRowEnd = m_aGrid.end();
+            ::std::vector< ::std::vector<TCell> >::const_iterator aRowEnd = m_aGrid.end();
             for (sal_Int32 i = 0; aRowIter != aRowEnd; ++aRowIter,++i)
             {
                 sal_Int32 nPosX = nLeftMargin;
                 ::std::vector<TCell>::iterator aColIter = (*aRowIter).begin();
-                ::std::vector<TCell>::iterator aColEnd = (*aRowIter).end();
+                ::std::vector<TCell>::const_iterator aColEnd = (*aRowIter).end();
                 for (sal_Int32 j = 0; aColIter != aColEnd; ++aColIter,++j)
                 {
                     TCell& rCell = *aColIter;
                     if ( !rCell.xElements.empty())
                     {
-                        ::std::vector< uno::Reference< report::XReportComponent> >::iterator aCellIter = rCell.xElements.begin();
-                        const ::std::vector< uno::Reference< report::XReportComponent> >::iterator aCellEnd = rCell.xElements.end();
+                        ::std::vector< uno::Reference< report::XReportComponent> >::const_iterator aCellIter = rCell.xElements.begin();
+                        const ::std::vector< uno::Reference< report::XReportComponent> >::const_iterator aCellEnd = rCell.xElements.end();
                         for (;aCellIter != aCellEnd ; ++aCellIter)
                         {
                             uno::Reference<report::XShape> xShape(*aCellIter,uno::UNO_QUERY);
@@ -215,7 +215,7 @@ void OXMLTable::EndElement()
                                 sal_Int32 nColSpan = rCell.nColSpan;
                                 if ( nColSpan > 1 )
                                 {
-                                    ::std::vector<TCell>::iterator aWidthIter = aColIter + 1;
+                                    ::std::vector<TCell>::const_iterator aWidthIter = aColIter + 1;
                                     while ( nColSpan > 1 )
                                     {
                                         nWidth += (aWidthIter++)->nWidth;
@@ -226,7 +226,7 @@ void OXMLTable::EndElement()
                                 sal_Int32 nRowSpan = rCell.nRowSpan;
                                 if ( nRowSpan > 1 )
                                 {
-                                    ::std::vector< ::std::vector<TCell> >::iterator aHeightIter = aRowIter + 1;
+                                    ::std::vector< ::std::vector<TCell> >::const_iterator aHeightIter = aRowIter + 1;
                                     while( nRowSpan > 1)
                                     {
                                         nHeight += (*aHeightIter)[j].nHeight;