Simplify containers iterations in sc/source/ui/[f-u]*

Use range-based loop or replace with STL functions

Change-Id: Ia117ee3bea76c1cee84c0d2bb43195c59764fe93
Reviewed-on: https://gerrit.libreoffice.org/65961
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

21 files changed, 150 insertions, 190 deletions

diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 980fd83b70de..f2c52f45fad7 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -239,10 +239,8 @@ void ScFunctionWin::UpdateFunctionList()
     }
     else // LRU list
     {
-        for (::std::vector<const formula::IFunctionDescription*>::iterator iter=aLRUList.begin();
-                iter != aLRUList.end(); ++iter)
+        for (const formula::IFunctionDescription* pDesc : aLRUList)
         {
-            const formula::IFunctionDescription* pDesc = *iter;
             if (pDesc)
                 aFuncList->SetEntryData( aFuncList->InsertEntry( pDesc->getFunctionName()), const_cast<formula::IFunctionDescription *>(pDesc));
         }
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index b1294a0ddff6..05d1ab0b22d3 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -202,9 +202,8 @@ void ScAcceptChgDlg::Init()
         aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser());
         pTPFilter->ClearAuthors();
         const std::set<OUString>& rUserColl = pChanges->GetUserCollection();
-        std::set<OUString>::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end();
-        for (; it != itEnd; ++it)
-            pTPFilter->InsertAuthor(*it);
+        for (const auto& rItem : rUserColl)
+            pTPFilter->InsertAuthor(rItem);
     }
 
     ScChangeViewSettings* pViewSettings=pDoc->GetChangeViewSettings();
@@ -1124,13 +1123,8 @@ bool ScAcceptChgDlg::InsertContentChildren(ScChangeActionMap* pActionMap,SvTreeL
     }
     SvTreeListEntry* pEntry=nullptr;
 
-    ScChangeActionMap::iterator itChangeAction = pActionMap->begin();
-    while( itChangeAction != pActionMap->end() )
-    {
-        if( itChangeAction->second->GetState()==SC_CAS_VIRGIN )
-            break;
-        ++itChangeAction;
-    }
+    ScChangeActionMap::iterator itChangeAction = std::find_if(pActionMap->begin(), pActionMap->end(),
+        [](const std::pair<sal_uLong, ScChangeAction*>& rEntry) { return rEntry.second->GetState() == SC_CAS_VIRGIN; });
 
     if( itChangeAction == pActionMap->end() )
         return true;
@@ -1215,11 +1209,10 @@ bool ScAcceptChgDlg::InsertChildren(ScChangeActionMap* pActionMap,SvTreeListEntr
 {
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     bool bTheTestFlag = true;
-    ScChangeActionMap::iterator itChangeAction;
 
-    for( itChangeAction = pActionMap->begin(); itChangeAction != pActionMap->end(); ++itChangeAction )
+    for( const auto& rChangeAction : *pActionMap )
     {
-        SvTreeListEntry* pEntry=AppendChangeAction( itChangeAction->second, pParent, false, true );
+        SvTreeListEntry* pEntry=AppendChangeAction( rChangeAction.second, pParent, false, true );
 
         if(pEntry!=nullptr)
         {
@@ -1230,8 +1223,8 @@ bool ScAcceptChgDlg::InsertChildren(ScChangeActionMap* pActionMap,SvTreeListEntr
             pEntryData->bIsAcceptable=false;
             pEntryData->bDisabled=true;
 
-            if( itChangeAction->second->IsDialogParent() )
-                Expand( pChanges, itChangeAction->second, pEntry );
+            if( rChangeAction.second->IsDialogParent() )
+                Expand( pChanges, rChangeAction.second, pEntry );
         }
     }
     return bTheTestFlag;
@@ -1243,15 +1236,14 @@ bool ScAcceptChgDlg::InsertDeletedChildren(const ScChangeAction* pScChangeAction
     ScChangeTrack* pChanges=pDoc->GetChangeTrack();
     bool bTheTestFlag = true;
     SvTreeListEntry* pEntry=nullptr;
-    ScChangeActionMap::iterator itChangeAction;
 
-    for( itChangeAction = pActionMap->begin(); itChangeAction != pActionMap->end(); ++itChangeAction )
+    for( const auto& rChangeAction : *pActionMap )
     {
 
-        if( pScChangeAction != itChangeAction->second )
-            pEntry = AppendChangeAction( itChangeAction->second, pParent, false, true );
+        if( pScChangeAction != rChangeAction.second )
+            pEntry = AppendChangeAction( rChangeAction.second, pParent, false, true );
         else
-            pEntry = AppendChangeAction( itChangeAction->second, pParent, true, true );
+            pEntry = AppendChangeAction( rChangeAction.second, pParent, true, true );
 
         if(pEntry!=nullptr)
         {
@@ -1262,8 +1254,8 @@ bool ScAcceptChgDlg::InsertDeletedChildren(const ScChangeAction* pScChangeAction
 
             bTheTestFlag=false;
 
-            if( itChangeAction->second->IsDialogParent() )
-                Expand( pChanges, itChangeAction->second, pEntry );
+            if( rChangeAction.second->IsDialogParent() )
+                Expand( pChanges, rChangeAction.second, pEntry );
         }
     }
     return bTheTestFlag;
@@ -1546,22 +1538,21 @@ void ScAcceptChgDlg::UpdateEntrys(const ScChangeTrack* pChgTrack, sal_uLong nSta
 
 IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void)
 {
-    ScChangeTrackMsgQueue::iterator iter;
     ScChangeTrackMsgQueue& aMsgQueue= rChgTrack.GetMsgQueue();
 
     sal_uLong   nStartAction;
     sal_uLong   nEndAction;
 
-    for (iter = aMsgQueue.begin(); iter != aMsgQueue.end(); ++iter)
+    for (const auto& pMsg : aMsgQueue)
     {
-        nStartAction=(*iter)->nStartAction;
-        nEndAction=(*iter)->nEndAction;
+        nStartAction = pMsg->nStartAction;
+        nEndAction = pMsg->nEndAction;
 
         if(!bIgnoreMsg)
         {
             bNoSelection=true;
 
-            switch((*iter)->eMsgType)
+            switch(pMsg->eMsgType)
             {
                 case SC_CTM_APPEND: AppendChanges(&rChgTrack,nStartAction,nEndAction);
                                     break;
@@ -1577,7 +1568,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack&, rChgTrack, void)
                 }
             }
         }
-        delete *iter;
+        delete pMsg;
     }
 
     aMsgQueue.clear();
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 95c1649ded09..759f711a399a 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -102,17 +102,16 @@ void ScConflictsListHelper::Transform_Impl( std::vector<sal_uLong>& rActionList,
 void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsList,
     ScChangeActionMergeMap* pSharedMap, ScChangeActionMergeMap* pOwnMap )
 {
-    ScConflictsList::iterator aEnd = rConflictsList.end();
-    for ( ScConflictsList::iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr )
+    for ( auto& rConflictEntry : rConflictsList )
     {
         if ( pSharedMap )
         {
-            ScConflictsListHelper::Transform_Impl( aItr->maSharedActions, pSharedMap );
+            ScConflictsListHelper::Transform_Impl( rConflictEntry.maSharedActions, pSharedMap );
         }
 
         if ( pOwnMap )
         {
-            ScConflictsListHelper::Transform_Impl( aItr->maOwnActions, pOwnMap );
+            ScConflictsListHelper::Transform_Impl( rConflictEntry.maOwnActions, pOwnMap );
         }
     }
 }
@@ -628,17 +627,15 @@ IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle, Button*, void)
 
 void ScConflictsDlg::UpdateView()
 {
-    ScConflictsList::iterator aEndItr = mrConflictsList.end();
-    for ( ScConflictsList::iterator aItr = mrConflictsList.begin(); aItr != aEndItr; ++aItr )
+    for ( ScConflictsListEntry& rConflictEntry : mrConflictsList )
     {
-        ScConflictsListEntry& rConflictEntry = *aItr;
         if (rConflictEntry.meConflictAction == SC_CONFLICT_ACTION_NONE)
         {
             RedlinData* pRootUserData = new RedlinData();
             pRootUserData->pData = static_cast<void*>(&rConflictEntry);
-            SvTreeListEntry* pRootEntry = m_pLbConflicts->InsertEntry( GetConflictString( *aItr ), pRootUserData );
+            SvTreeListEntry* pRootEntry = m_pLbConflicts->InsertEntry( GetConflictString( rConflictEntry ), pRootUserData );
 
-            for ( auto& aSharedAction : aItr->maSharedActions )
+            for ( auto& aSharedAction : rConflictEntry.maSharedActions )
             {
                 ScChangeAction* pAction = mpSharedTrack ? mpSharedTrack->GetAction(aSharedAction) : nullptr;
                 if ( pAction )
@@ -647,7 +644,7 @@ void ScConflictsDlg::UpdateView()
                     if ( pAction->GetType() == SC_CAT_CONTENT )
                     {
                         ScChangeActionContent* pNextContent = dynamic_cast<ScChangeActionContent&>(*pAction).GetNextContent();
-                        if ( pNextContent && aItr->HasSharedAction( pNextContent->GetActionNumber() ) )
+                        if ( pNextContent && rConflictEntry.HasSharedAction( pNextContent->GetActionNumber() ) )
                         {
                             continue;
                         }
@@ -658,7 +655,7 @@ void ScConflictsDlg::UpdateView()
                 }
             }
 
-            for ( auto& aOwnAction : aItr->maOwnActions )
+            for ( auto& aOwnAction : rConflictEntry.maOwnActions )
             {
                 ScChangeAction* pAction = mpOwnTrack ? mpOwnTrack->GetAction(aOwnAction) : nullptr;
                 if ( pAction )
@@ -667,7 +664,7 @@ void ScConflictsDlg::UpdateView()
                     if ( pAction->GetType() == SC_CAT_CONTENT )
                     {
                         ScChangeActionContent* pNextContent = dynamic_cast<ScChangeActionContent&>(*pAction).GetNextContent();
-                        if ( pNextContent && aItr->HasOwnAction( pNextContent->GetActionNumber() ) )
+                        if ( pNextContent && rConflictEntry.HasOwnAction( pNextContent->GetActionNumber() ) )
                         {
                             continue;
                         }
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index 6bfd7c78ed41..efd37d8acd4e 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -217,10 +217,10 @@ void ScDataFormDlg::dispose()
     m_pBtnClose.clear();
     m_pSlider.clear();
     m_pFixedText.clear();
-    for ( auto aFTIter = maFixedTexts.begin(); aFTIter != maFixedTexts.end(); ++aFTIter )
-        aFTIter->disposeAndClear();
-    for ( auto aEditIter = maEdits.begin(); aEditIter != maEdits.end(); ++aEditIter )
-        aEditIter->disposeAndClear();
+    for ( auto& rxFTIter : maFixedTexts )
+        rxFTIter.disposeAndClear();
+    for ( auto& rxEdit : maEdits )
+        rxEdit.disposeAndClear();
     maFixedTexts.clear();
     maEdits.clear();
     m_pGrid.clear();
@@ -269,15 +269,8 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl, Button*, void)
     ScDocShell* pDocSh = rViewData.GetDocShell();
     if ( pDoc )
     {
-        bool bHasData = false;
-        auto itr = maEdits.begin(), itrEnd = maEdits.end();
-        for(; itr != itrEnd; ++itr)
-            if ((*itr) != nullptr)
-                if ( !(*itr)->GetText().isEmpty() )
-                {
-                    bHasData = true;
-                    break;
-                }
+        bool bHasData = std::any_of(maEdits.begin(), maEdits.end(),
+            [](const VclPtr<Edit>& rxEdit) { return (rxEdit != nullptr) && (!rxEdit->GetText().isEmpty()); });
 
         if ( bHasData )
         {
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 17d3f752dbad..9030ee1f2b66 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -84,9 +84,8 @@ void ScHighlightChgDlg::Init()
         aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser());
         m_pFilterCtr->ClearAuthors();
         const std::set<OUString>& rUserColl = pChanges->GetUserCollection();
-        std::set<OUString>::const_iterator it = rUserColl.begin(), itEnd = rUserColl.end();
-        for (; it != itEnd; ++it)
-            m_pFilterCtr->InsertAuthor(*it);
+        for (const auto& rItem : rUserColl)
+            m_pFilterCtr->InsertAuthor(rItem);
     }
 
     ScChangeViewSettings* pViewSettings=pDoc->GetChangeViewSettings();
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index d01864afd8e2..67adcb1dbe9a 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -29,9 +29,8 @@ ScSelEntryDlg::ScSelEntryDlg(weld::Window* pParent, const std::vector<OUString>
                             m_xLb->get_height_rows(8));
     m_xLb->connect_row_activated(LINK(this, ScSelEntryDlg, DblClkHdl));
 
-    std::vector<OUString>::const_iterator pIter;
-    for (pIter = rEntryList.begin(); pIter != rEntryList.end(); ++pIter)
-        m_xLb->append_text(*pIter);
+    for (const auto& rEntry : rEntryList)
+        m_xLb->append_text(rEntry);
 
     if (m_xLb->n_children() > 0)
         m_xLb->select(0);
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 66ecf951665e..8d26590cfb79 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -868,17 +868,16 @@ bool ScOptSolverDlg::CallSolver()       // return true -> close dialog after cal
 
     uno::Sequence<sheet::SolverConstraint> aConstraints;
     sal_Int32 nConstrPos = 0;
-    for ( std::vector<ScOptConditionRow>::const_iterator aConstrIter = maConditions.begin();
-          aConstrIter != maConditions.end(); ++aConstrIter )
+    for ( const auto& rConstr : maConditions )
     {
-        if ( !aConstrIter->aLeftStr.isEmpty() )
+        if ( !rConstr.aLeftStr.isEmpty() )
         {
             sheet::SolverConstraint aConstraint;
             // order of list box entries must match enum values
-            aConstraint.Operator = static_cast<sheet::SolverConstraintOperator>(aConstrIter->nOperator);
+            aConstraint.Operator = static_cast<sheet::SolverConstraintOperator>(rConstr.nOperator);
 
             ScRange aLeftRange;
-            if ( !ParseRef( aLeftRange, aConstrIter->aLeftStr, true ) )
+            if ( !ParseRef( aLeftRange, rConstr.aLeftStr, true ) )
             {
                 ShowError( true, nullptr );
                 return false;
@@ -886,7 +885,7 @@ bool ScOptSolverDlg::CallSolver()       // return true -> close dialog after cal
 
             bool bIsRange = false;
             ScRange aRightRange;
-            if ( ParseRef( aRightRange, aConstrIter->aRightStr, true ) )
+            if ( ParseRef( aRightRange, rConstr.aRightStr, true ) )
             {
                 if ( aRightRange.aStart == aRightRange.aEnd )
                     aConstraint.Right <<= table::CellAddress( aRightRange.aStart.Tab(),
@@ -904,7 +903,7 @@ bool ScOptSolverDlg::CallSolver()       // return true -> close dialog after cal
             {
                 sal_uInt32 nFormat = 0;     //! explicit language?
                 double fValue = 0.0;
-                if ( mrDoc.GetFormatTable()->IsNumberFormat( aConstrIter->aRightStr, nFormat, fValue ) )
+                if ( mrDoc.GetFormatTable()->IsNumberFormat( rConstr.aRightStr, nFormat, fValue ) )
                     aConstraint.Right <<= fValue;
                 else if ( aConstraint.Operator != sheet::SolverConstraintOperator_INTEGER &&
                           aConstraint.Operator != sheet::SolverConstraintOperator_BINARY )
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 14b51656b01b..2af3344b94dd 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -64,9 +64,9 @@ void ScRetypePassDlg::dispose()
 
 void ScRetypePassDlg::DeleteSheets()
 {
-    for(auto it = maSheets.begin(); it != maSheets.end(); ++it)
+    for(auto& rxSheet : maSheets)
     {
-        VclPtr<vcl::Window> pWindow = (*it);
+        VclPtr<vcl::Window> pWindow = rxSheet;
         vcl::Window *pChild = pWindow->GetWindow(GetWindowType::FirstChild);
         while (pChild)
         {
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index c5ada4123716..2b08756b4d87 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -128,9 +128,8 @@ void ScAutoFormatDlg::Init()
     m_pBtnRename->SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) );
     m_pLbFormat->SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) );
 
-    ScAutoFormat::const_iterator it = pFormat->begin(), itEnd = pFormat->end();
-    for (; it != itEnd; ++it)
-        m_pLbFormat->InsertEntry(it->second->GetName());
+    for (const auto& rEntry : *pFormat)
+        m_pLbFormat->InsertEntry(rEntry.second->GetName());
 
     if (pFormat->size() == 1)
         m_pBtnRemove->Disable();
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index fd3f8588c6e5..ac5afcb728de 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -83,12 +83,9 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent
     {
         std::map<OUString, ScRangeName*> aRangeMap;
         mpDoc->GetRangeNameMap(aRangeMap);
-        std::map<OUString, ScRangeName*>::iterator itr = aRangeMap.begin(), itrEnd = aRangeMap.end();
-        for (; itr != itrEnd; ++itr)
+        for (const auto& [aTemp, pRangeName] : aRangeMap)
         {
-            OUString aTemp(itr->first);
-            m_RangeMap.insert(std::make_pair(aTemp,
-                    o3tl::make_unique<ScRangeName>(*itr->second)));
+            m_RangeMap.insert(std::make_pair(aTemp, o3tl::make_unique<ScRangeName>(*pRangeName)));
         }
     }
     else
@@ -352,10 +349,10 @@ void ScNameDlg::RemovePushed()
 {
     std::vector<ScRangeNameLine> aEntries = m_pRangeManagerTable->GetSelectedEntries();
     m_pRangeManagerTable->DeleteSelectedEntries();
-    for (std::vector<ScRangeNameLine>::iterator itr = aEntries.begin(); itr != aEntries.end(); ++itr)
+    for (const auto& rEntry : aEntries)
     {
-        ScRangeName* pRangeName = GetRangeName(itr->aScope);
-        ScRangeData* pData = pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(itr->aName));
+        ScRangeName* pRangeName = GetRangeName(rEntry.aScope);
+        ScRangeData* pData = pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(rEntry.aName));
         OSL_ENSURE(pData, "table and model should be in sync");
         // be safe and check for possible problems
         if (pData)
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index eb598412b177..5655a6a1d1a2 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -153,12 +153,11 @@ void ScRangeManagerTable::Init()
             aLine.aScope = maGlobalString;
         else
             aLine.aScope = itr.first;
-        for (ScRangeName::const_iterator it = pLocalRangeName->begin();
-                it != pLocalRangeName->end(); ++it)
+        for (const auto& rEntry : *pLocalRangeName)
         {
-            if (!it->second->HasType(ScRangeData::Type::Database))
+            if (!rEntry.second->HasType(ScRangeData::Type::Database))
             {
-                aLine.aName = it->second->GetName();
+                aLine.aName = rEntry.second->GetName();
                 addEntry(aLine, false);
             }
         }
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 7b9125bb622e..a7d531e34976 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -37,11 +37,9 @@ ScNamePasteDlg::ScNamePasteDlg( vcl::Window * pParent, ScDocShell* pShell )
     ScDocument& rDoc = pShell->GetDocument();
     std::map<OUString, ScRangeName*> aCopyMap;
     rDoc.GetRangeNameMap(aCopyMap);
-    std::map<OUString, ScRangeName*>::iterator itr = aCopyMap.begin(), itrEnd = aCopyMap.end();
-    for (; itr != itrEnd; ++itr)
+    for (const auto& [aTemp, pName] : aCopyMap)
     {
-        OUString aTemp(itr->first);
-        m_RangeMap.insert(std::make_pair(aTemp, o3tl::make_unique<ScRangeName>(*itr->second)));
+        m_RangeMap.insert(std::make_pair(aTemp, o3tl::make_unique<ScRangeName>(*pName)));
     }
 
     ScViewData* pViewData = ScDocShell::GetViewData();
@@ -87,10 +85,9 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton, void )
     else if( pButton == m_pBtnPaste )
     {
         std::vector<ScRangeNameLine> aSelectedLines = mpTable->GetSelectedEntries();
-        for (std::vector<ScRangeNameLine>::const_iterator itr = aSelectedLines.begin();
-                itr != aSelectedLines.end(); ++itr)
+        for (const auto& rLine : aSelectedLines)
         {
-            maSelectedNames.push_back(itr->aName);
+            maSelectedNames.push_back(rLine.aName);
         }
         EndDialog( BTN_PASTE_NAME );
     }
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index c11936752551..f3410df2175a 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -890,11 +890,10 @@ void ScContentTree::GetAreaNames()
     ScRange aDummy;
     std::set<OUString> aSet;
     ScRangeName* pRangeNames = pDoc->GetRangeName();
-    ScRangeName::const_iterator itrBeg = pRangeNames->begin(), itrEnd = pRangeNames->end();
-    for (ScRangeName::const_iterator itr = itrBeg; itr != itrEnd; ++itr)
+    for (const auto& rEntry : *pRangeNames)
     {
-        if (itr->second->IsValidReference(aDummy))
-            aSet.insert(itr->second->GetName());
+        if (rEntry.second->IsValidReference(aDummy))
+            aSet.insert(rEntry.second->GetName());
     }
     for (SCTAB i = 0; i < pDoc->GetTableCount(); ++i)
     {
@@ -903,18 +902,17 @@ void ScContentTree::GetAreaNames()
         {
             OUString aTableName;
             pDoc->GetName(i, aTableName);
-            for (ScRangeName::const_iterator itr = pLocalRangeName->begin(); itr != pLocalRangeName->end(); ++itr)
+            for (const auto& rEntry : *pLocalRangeName)
             {
-                if (itr->second->IsValidReference(aDummy))
-                    aSet.insert(createLocalRangeName(itr->second->GetName(), aTableName));
+                if (rEntry.second->IsValidReference(aDummy))
+                    aSet.insert(createLocalRangeName(rEntry.second->GetName(), aTableName));
             }
         }
     }
 
-    for (std::set<OUString>::iterator itr = aSet.begin();
-            itr != aSet.end(); ++itr)
+    for (const auto& rItem : aSet)
     {
-        InsertContent(ScContentId::RANGENAME, *itr);
+        InsertContent(ScContentId::RANGENAME, rItem);
     }
 }
 
@@ -929,10 +927,9 @@ void ScContentTree::GetDbNames()
 
     ScDBCollection* pDbNames = pDoc->GetDBCollection();
     const ScDBCollection::NamedDBs& rDBs = pDbNames->getNamedDBs();
-    ScDBCollection::NamedDBs::const_iterator itr = rDBs.begin(), itrEnd = rDBs.end();
-    for (; itr != itrEnd; ++itr)
+    for (const auto& rxDB : rDBs)
     {
-        const OUString& aStrName = (*itr)->GetName();
+        const OUString& aStrName = rxDB->GetName();
         InsertContent(ScContentId::DBAREA, aStrName);
     }
 }
@@ -1095,9 +1092,8 @@ void ScContentTree::GetNoteStrings()
     // loop over cell notes
     std::vector<sc::NoteEntry> aEntries;
     pDoc->GetAllNoteEntries(aEntries);
-    std::vector<sc::NoteEntry>::const_iterator it = aEntries.begin(), itEnd = aEntries.end();
-    for (; it != itEnd; ++it)
-        InsertContent(ScContentId::NOTE, lcl_NoteString(*it->mpNote));
+    for (const auto& rEntry : aEntries)
+        InsertContent(ScContentId::NOTE, lcl_NoteString(*rEntry.mpNote));
 }
 
 ScAddress ScContentTree::GetNotePos( sal_uLong nIndex )
@@ -1123,10 +1119,9 @@ bool ScContentTree::NoteStringsChanged()
 
     std::vector<sc::NoteEntry> aEntries;
     pDoc->GetAllNoteEntries(aEntries);
-    std::vector<sc::NoteEntry>::const_iterator it = aEntries.begin(), itEnd = aEntries.end();
-    for (; it != itEnd; ++it)
+    for (const auto& rEntry : aEntries)
     {
-        const ScPostIt* pNote = it->mpNote;
+        const ScPostIt* pNote = rEntry.mpNote;
         if (!pEntry)
             return true;
 
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 4025adcb0236..b7ef9fe1e343 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -433,20 +433,19 @@ void ScPrintAreasDlg::Impl_FillLists()
         // No range names to process.
         return;
 
-    ScRangeName::const_iterator itr = pRangeNames->begin(), itrEnd = pRangeNames->end();
-    for (; itr != itrEnd; ++itr)
+    for (const auto& rEntry : *pRangeNames)
     {
-        if (!itr->second->HasType(ScRangeData::Type::AbsArea   )
-            && !itr->second->HasType(ScRangeData::Type::RefArea)
-            && !itr->second->HasType(ScRangeData::Type::AbsPos ))
+        if (!rEntry.second->HasType(ScRangeData::Type::AbsArea   )
+            && !rEntry.second->HasType(ScRangeData::Type::RefArea)
+            && !rEntry.second->HasType(ScRangeData::Type::AbsPos ))
             continue;
 
-        OUString aName = itr->second->GetName();
+        OUString aName = rEntry.second->GetName();
         OUString aSymbol;
-        itr->second->GetSymbol(aSymbol);
+        rEntry.second->GetSymbol(aSymbol);
         if (aRange.ParseAny(aSymbol, pDoc, eConv) & ScRefFlags::VALID)
         {
-            if (itr->second->HasType(ScRangeData::Type::PrintArea))
+            if (rEntry.second->HasType(ScRangeData::Type::PrintArea))
             {
                 aSymbol = aRange.Format(ScRefFlags::RANGE_ABS, pDoc, eConv);
                 pLbPrintArea->SetEntryData(
@@ -454,7 +453,7 @@ void ScPrintAreasDlg::Impl_FillLists()
                     new OUString(aSymbol) );
             }
 
-            if (itr->second->HasType(ScRangeData::Type::RowHeader))
+            if (rEntry.second->HasType(ScRangeData::Type::RowHeader))
             {
                 lcl_GetRepeatRangeString(&aRange, pDoc, true, aSymbol);
                 pLbRepeatRow->SetEntryData(
@@ -462,7 +461,7 @@ void ScPrintAreasDlg::Impl_FillLists()
                     new OUString(aSymbol) );
             }
 
-            if (itr->second->HasType(ScRangeData::Type::ColHeader))
+            if (rEntry.second->HasType(ScRangeData::Type::ColHeader))
             {
                 lcl_GetRepeatRangeString(&aRange, pDoc, false, aSymbol);
                 pLbRepeatCol->SetEntryData(
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index a14410e399bb..a6ff4f184a40 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -212,10 +212,9 @@ void ScSimpleUndo::BroadcastChanges( const DataSpansType& rSpans )
     ScDocument& rDoc = pDocShell->GetDocument();
     SpanBroadcaster aBroadcaster(rDoc);
 
-    DataSpansType::const_iterator it = rSpans.begin(), itEnd = rSpans.end();
-    for (; it != itEnd; ++it)
+    for (const auto& rEntry : rSpans)
     {
-        const sc::ColumnSpanSet& rSet = *it->second;
+        const sc::ColumnSpanSet& rSet = *rEntry.second;
         rSet.executeColumnAction(rDoc, aBroadcaster);
     }
 }
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 5d66cc393150..1404d6e66ad3 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -724,22 +724,20 @@ void ScUndoDeleteMulti::Undo()
     ScDocument& rDoc = pDocShell->GetDocument();
 
     // reverse delete -> forward insert
-    std::vector<sc::ColRowSpan>::const_iterator it = maSpans.begin(), itEnd = maSpans.end();
-    for (; it != itEnd; ++it)
+    for (const auto& rSpan : maSpans)
     {
-        SCCOLROW nStart = it->mnStart;
-        SCCOLROW nEnd = it->mnEnd;
+        SCCOLROW nStart = rSpan.mnStart;
+        SCCOLROW nEnd = rSpan.mnEnd;
         if (mbRows)
             rDoc.InsertRow( 0,nTab, MAXCOL,nTab, nStart,static_cast<SCSIZE>(nEnd-nStart+1) );
         else
             rDoc.InsertCol( 0,nTab, MAXROW,nTab, static_cast<SCCOL>(nStart), static_cast<SCSIZE>(nEnd-nStart+1) );
     }
 
-    it = maSpans.begin();
-    for (; it != itEnd; ++it)
+    for (const auto& rSpan : maSpans)
     {
-        SCCOLROW nStart = it->mnStart;
-        SCCOLROW nEnd = it->mnEnd;
+        SCCOLROW nStart = rSpan.mnStart;
+        SCCOLROW nEnd = rSpan.mnEnd;
         if (mbRows)
             pRefUndoDoc->CopyToDocument(0, nStart, nTab, MAXCOL, nEnd, nTab, InsertDeleteFlags::ALL, false, rDoc);
         else
@@ -1028,14 +1026,16 @@ void ScUndoPaste::DoChange(bool bUndo)
             aRange.aStart.SetTab(nFirstSelected);
             aRange.aEnd.SetTab(nFirstSelected);
             pRedoDoc->UndoToDocument(aRange, nUndoFlags, false, rDoc);
-            ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
-            for (; itr != itrEnd && *itr < nTabCount; ++itr)
+            for (const auto& rTab : aMarkData)
             {
-                if (*itr == nFirstSelected)
+                if (rTab >= nTabCount)
+                    break;
+
+                if (rTab == nFirstSelected)
                     continue;
 
-                aRange.aStart.SetTab(*itr);
-                aRange.aEnd.SetTab(*itr);
+                aRange.aStart.SetTab(rTab);
+                aRange.aEnd.SetTab(rTab);
                 pRedoDoc->CopyToDocument(aRange, nUndoFlags, false, rDoc);
             }
         }
@@ -1057,11 +1057,12 @@ void ScUndoPaste::DoChange(bool bUndo)
         for (size_t i = 0, n = maBlockRanges.size(); i < n; ++i)
         {
             ScRange aRange = maBlockRanges[i];
-            ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
-            for (; itr != itrEnd && *itr < nTabCount; ++itr)
+            for (const auto& rTab : aMarkData)
             {
-                aRange.aStart.SetTab(*itr);
-                aRange.aEnd.SetTab(*itr);
+                if (rTab >= nTabCount)
+                    break;
+                aRange.aStart.SetTab(rTab);
+                aRange.aEnd.SetTab(rTab);
                 pUndoDoc->UndoToDocument(aRange, nUndoFlags, false, rDoc);
             }
         }
@@ -2263,21 +2264,20 @@ void ScUndoRemoveMerge::Undo()
     ScDocument& rDoc = pDocShell->GetDocument();
     for (const auto & rOption : maOptions)
     {
-        for (set<SCTAB>::const_iterator itr = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end();
-                itr != itrEnd; ++itr)
+        for (const auto& rTab : rOption.maTabs)
         {
             OSL_ENSURE(pUndoDoc, "NULL pUndoDoc!");
             if (!pUndoDoc)
                 continue;
             // There is no need to extend merge area because it's already been extended.
-            ScRange aRange = rOption.getSingleRange(*itr);
+            ScRange aRange = rOption.getSingleRange(rTab);
             rDoc.DeleteAreaTab(aRange, InsertDeleteFlags::ATTRIB);
             pUndoDoc->CopyToDocument(aRange, InsertDeleteFlags::ATTRIB, false, rDoc);
 
             bool bDidPaint = false;
             if ( pViewShell )
             {
-                pViewShell->SetTabNo(*itr);
+                pViewShell->SetTabNo(rTab);
                 bDidPaint = pViewShell->AdjustRowHeight(rOption.mnStartRow, rOption.mnEndRow);
             }
             if (!bDidPaint)
@@ -2300,10 +2300,8 @@ void ScUndoRemoveMerge::Redo()
 
     for (const auto & rOption : maOptions)
     {
-        for (set<SCTAB>::const_iterator itr = rOption.maTabs.begin(), itrEnd = rOption.maTabs.end();
-                itr != itrEnd; ++itr)
+        for (const SCTAB nTab : rOption.maTabs)
         {
-            SCTAB nTab = *itr;
             // There is no need to extend merge area because it's already been extended.
             ScRange aRange = rOption.getSingleRange(nTab);
 
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 6418e604192b..163429522244 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -99,26 +99,28 @@ void ScUndoWidthOrHeight::Undo()
 
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
     SCTAB nTabCount = rDoc.GetTableCount();
-    ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
-    for (; itr != itrEnd && *itr < nTabCount; ++itr)
+    for (const auto& rTab : aMarkData)
     {
+        if (rTab >= nTabCount)
+            break;
+
         if (pViewShell)
             pViewShell->OnLOKSetWidthOrHeight(nStart, bWidth);
 
         if (bWidth) // Width
         {
-            pUndoDoc->CopyToDocument(static_cast<SCCOL>(nStart), 0, *itr,
-                                     static_cast<SCCOL>(nEnd), MAXROW, *itr, InsertDeleteFlags::NONE,
+            pUndoDoc->CopyToDocument(static_cast<SCCOL>(nStart), 0, rTab,
+                                     static_cast<SCCOL>(nEnd), MAXROW, rTab, InsertDeleteFlags::NONE,
                                      false, rDoc);
-            rDoc.UpdatePageBreaks( *itr );
-            pDocShell->PostPaint( static_cast<SCCOL>(nPaintStart), 0, *itr,
-                    MAXCOL, MAXROW, *itr, PaintPartFlags::Grid | PaintPartFlags::Top );
+            rDoc.UpdatePageBreaks( rTab );
+            pDocShell->PostPaint( static_cast<SCCOL>(nPaintStart), 0, rTab,
+                    MAXCOL, MAXROW, rTab, PaintPartFlags::Grid | PaintPartFlags::Top );
         }
         else        // Height
         {
-            pUndoDoc->CopyToDocument(0, nStart, *itr, MAXCOL, nEnd, *itr, InsertDeleteFlags::NONE, false, rDoc);
-            rDoc.UpdatePageBreaks( *itr );
-            pDocShell->PostPaint( 0, nPaintStart, *itr, MAXCOL, MAXROW, *itr, PaintPartFlags::Grid | PaintPartFlags::Left );
+            pUndoDoc->CopyToDocument(0, nStart, rTab, MAXCOL, nEnd, rTab, InsertDeleteFlags::NONE, false, rDoc);
+            rDoc.UpdatePageBreaks( rTab );
+            pDocShell->PostPaint( 0, nPaintStart, rTab, MAXCOL, MAXROW, rTab, PaintPartFlags::Grid | PaintPartFlags::Left );
         }
     }
 
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index bc7173aa15bb..b83c7f144e35 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -246,13 +246,14 @@ void ScUndoFillTable::SetChangeTrack()
         ScRange aWorkRange(aRange);
         nStartChangeAction = 0;
         sal_uLong nTmpAction;
-        ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
-        for (; itr != itrEnd && *itr < nTabCount; ++itr)
+        for (const auto& rTab : aMarkData)
         {
-            if (*itr != nSrcTab)
+            if (rTab >= nTabCount)
+                break;
+            if (rTab != nSrcTab)
             {
-                aWorkRange.aStart.SetTab(*itr);
-                aWorkRange.aEnd.SetTab(*itr);
+                aWorkRange.aStart.SetTab(rTab);
+                aWorkRange.aEnd.SetTab(rTab);
                 pChangeTrack->AppendContentRange( aWorkRange, pUndoDoc.get(),
                     nTmpAction, nEndChangeAction );
                 if ( !nStartChangeAction )
@@ -274,18 +275,21 @@ void ScUndoFillTable::DoChange( const bool bUndo )
     {
         SCTAB nTabCount = rDoc.GetTableCount();
         ScRange aWorkRange(aRange);
-        ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
-        for (; itr != itrEnd && *itr < nTabCount; ++itr)
-            if (*itr != nSrcTab)
+        for (const auto& rTab : aMarkData)
+        {
+            if (rTab >= nTabCount)
+                break;
+            if (rTab != nSrcTab)
             {
-                aWorkRange.aStart.SetTab(*itr);
-                aWorkRange.aEnd.SetTab(*itr);
+                aWorkRange.aStart.SetTab(rTab);
+                aWorkRange.aEnd.SetTab(rTab);
                 if (bMulti)
-                    rDoc.DeleteSelectionTab( *itr, InsertDeleteFlags::ALL, aMarkData );
+                    rDoc.DeleteSelectionTab( rTab, InsertDeleteFlags::ALL, aMarkData );
                 else
                     rDoc.DeleteAreaTab( aWorkRange, InsertDeleteFlags::ALL );
                 pUndoDoc->CopyToDocument(aWorkRange, InsertDeleteFlags::ALL, bMulti, rDoc, &aMarkData);
             }
+        }
 
         ScChangeTrack* pChangeTrack = rDoc.GetChangeTrack();
         if ( pChangeTrack )
@@ -527,12 +531,13 @@ void ScUndoAutoFill::Undo()
     ScDocument& rDoc = pDocShell->GetDocument();
 
     SCTAB nTabCount = rDoc.GetTableCount();
-    ScMarkData::iterator itr = aMarkData.begin(), itrEnd = aMarkData.end();
-    for (; itr != itrEnd && *itr < nTabCount; ++itr)
+    for (const auto& rTab : aMarkData)
     {
+        if (rTab >= nTabCount)
+            break;
         ScRange aWorkRange = aBlockRange;
-        aWorkRange.aStart.SetTab(*itr);
-        aWorkRange.aEnd.SetTab(*itr);
+        aWorkRange.aStart.SetTab(rTab);
+        aWorkRange.aEnd.SetTab(rTab);
 
         sal_uInt16 nExtFlags = 0;
         pDocShell->UpdatePaintExt( nExtFlags, aWorkRange );
@@ -669,10 +674,8 @@ void ScUndoMerge::DoChange( bool bUndo ) const
     ScRange aCurRange = maOption.getSingleRange(ScDocShell::GetCurTab());
     ScUndoUtil::MarkSimpleBlock(pDocShell, aCurRange);
 
-    for (set<SCTAB>::const_iterator itr = maOption.maTabs.begin(), itrEnd = maOption.maTabs.end();
-          itr != itrEnd; ++itr)
+    for (const SCTAB nTab : maOption.maTabs)
     {
-        SCTAB nTab = *itr;
         ScRange aRange = maOption.getSingleRange(nTab);
 
         if (bUndo)
diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx
index eb195e466b2e..c139f59f8189 100644
--- a/sc/source/ui/undo/undorangename.cxx
+++ b/sc/source/ui/undo/undorangename.cxx
@@ -27,10 +27,9 @@ ScUndoAllRangeNames::ScUndoAllRangeNames(
     const std::map<OUString, std::unique_ptr<ScRangeName>>& rNewNames)
         : ScSimpleUndo(pDocSh)
 {
-    std::map<OUString, ScRangeName*>::const_iterator itr, itrEnd;
-    for (itr = rOldNames.begin(), itrEnd = rOldNames.end(); itr != itrEnd; ++itr)
+    for (const auto& [rName, pRangeName] : rOldNames)
     {
-        m_OldNames.insert(std::make_pair(itr->first,o3tl::make_unique<ScRangeName>(*itr->second)));
+        m_OldNames.insert(std::make_pair(rName, o3tl::make_unique<ScRangeName>(*pRangeName)));
     }
 
     for (auto const& it : rNewNames)
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index 62b19d45c6ce..1a868c330c8b 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -240,10 +240,10 @@ OUString ScUndoApplyPageStyle::GetComment() const
 void ScUndoApplyPageStyle::Undo()
 {
     BeginUndo();
-    for( ApplyStyleVec::const_iterator aIt = maEntries.begin(), aEnd = maEntries.end(); aIt != aEnd; ++aIt )
+    for( const auto& rEntry : maEntries )
     {
-        pDocShell->GetDocument().SetPageStyle( aIt->mnTab, aIt->maOldStyle );
-        ScPrintFunc( pDocShell, pDocShell->GetPrinter(), aIt->mnTab ).UpdatePages();
+        pDocShell->GetDocument().SetPageStyle( rEntry.mnTab, rEntry.maOldStyle );
+        ScPrintFunc( pDocShell, pDocShell->GetPrinter(), rEntry.mnTab ).UpdatePages();
     }
     EndUndo();
 }
@@ -251,10 +251,10 @@ void ScUndoApplyPageStyle::Undo()
 void ScUndoApplyPageStyle::Redo()
 {
     BeginRedo();
-    for( ApplyStyleVec::const_iterator aIt = maEntries.begin(), aEnd = maEntries.end(); aIt != aEnd; ++aIt )
+    for( const auto& rEntry : maEntries )
     {
-        pDocShell->GetDocument().SetPageStyle( aIt->mnTab, maNewStyle );
-        ScPrintFunc( pDocShell, pDocShell->GetPrinter(), aIt->mnTab ).UpdatePages();
+        pDocShell->GetDocument().SetPageStyle( rEntry.mnTab, maNewStyle );
+        ScPrintFunc( pDocShell, pDocShell->GetPrinter(), rEntry.mnTab ).UpdatePages();
     }
     EndRedo();
 }
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 24e784feea75..8514920bcaa8 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -1098,11 +1098,8 @@ void ScUndoShowHideTab::DoChange( bool bShowP ) const
     ScDocument& rDoc = pDocShell->GetDocument();
     ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell();
 
-    SCTAB nTab;
-
-    for(std::vector<SCTAB>::const_iterator itr = undoTabs.begin(), itrEnd = undoTabs.end(); itr != itrEnd; ++itr)
+    for(const SCTAB& nTab : undoTabs)
     {
-        nTab = *itr;
         rDoc.SetVisible( nTab, bShowP );
         if (pViewShell)
             pViewShell->SetTabNo(nTab,true);