Simplify containers iterations in sc/source/ui/[A-Sa-d]*

Use range-based loop or replace with STL functions

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

4 files changed, 30 insertions, 56 deletions

diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 59cb1ac4454f..163f155a2ebc 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -326,10 +326,9 @@ void ScDrawTransferObj::AddSupportedFormats()
             //  (this must be after inserting the default formats!)
 
             DataFlavorExVector              aVector( m_aOleData.GetDataFlavorExVector() );
-            DataFlavorExVector::iterator    aIter( aVector.begin() ), aEnd( aVector.end() );
 
-            while( aIter != aEnd )
-                AddFormat( *aIter++ );
+            for( const auto& rItem : aVector )
+                AddFormat( rItem );
         }
     }
     else                        // any drawing objects
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 377495e609d1..aabcc77ec6a4 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -114,6 +114,9 @@ ScTypedCaseStrSet::const_iterator findText(
     const ScTypedCaseStrSet& rDataSet, ScTypedCaseStrSet::const_iterator const & itPos,
     const OUString& rStart, OUString& rResult, bool bBack)
 {
+    auto lIsMatch = [&rStart](const ScTypedStrData& rData) {
+        return (rData.GetStringType() != ScTypedStrData::Value) && ScGlobal::GetpTransliteration()->isMatch(rStart, rData.GetString()); };
+
     if (bBack) // Backwards
     {
         ScTypedCaseStrSet::const_reverse_iterator it = rDataSet.rbegin(), itEnd = rDataSet.rend();
@@ -125,42 +128,25 @@ ScTypedCaseStrSet::const_iterator findText(
             ++it;
         }
 
-        for (; it != itEnd; ++it)
+        it = std::find_if(it, itEnd, lIsMatch);
+        if (it != itEnd)
         {
-            const ScTypedStrData& rData = *it;
-            if (rData.GetStringType() == ScTypedStrData::Value)
-                // skip values
-                continue;
-
-            if (!ScGlobal::GetpTransliteration()->isMatch(rStart, rData.GetString()))
-                // not a match
-                continue;
-
-            rResult = rData.GetString();
+            rResult = it->GetString();
             return (++it).base(); // convert the reverse iterator back to iterator.
         }
     }
     else // Forwards
     {
         ScTypedCaseStrSet::const_iterator it = rDataSet.begin(), itEnd = rDataSet.end();
-        if (itPos != rDataSet.end())
+        if (itPos != itEnd)
         {
-            it = itPos;
-            ++it;
+            it = std::next(itPos);
         }
 
-        for (; it != itEnd; ++it)
+        it = std::find_if(it, itEnd, lIsMatch);
+        if (it != itEnd)
         {
-            const ScTypedStrData& rData = *it;
-            if (rData.GetStringType() == ScTypedStrData::Value)
-                // skip values
-                continue;
-
-            if (!ScGlobal::GetpTransliteration()->isMatch(rStart, rData.GetString()))
-                // not a match
-                continue;
-
-            rResult = rData.GetString();
+            rResult = it->GetString();
             return it;
         }
     }
@@ -170,18 +156,13 @@ ScTypedCaseStrSet::const_iterator findText(
 
 OUString getExactMatch(const ScTypedCaseStrSet& rDataSet, const OUString& rString)
 {
-    ScTypedCaseStrSet::const_iterator it = rDataSet.begin(), itEnd = rDataSet.end();
-    for (; it != itEnd; ++it)
-    {
-        const ScTypedStrData& rData = *it;
-        if (rData.GetStringType() == ScTypedStrData::Value)
-            continue;
-
-        if (!ScGlobal::GetpTransliteration()->isEqual(rData.GetString(), rString))
-            continue;
-
-        return rData.GetString();
-    }
+    auto it = std::find_if(rDataSet.begin(), rDataSet.end(),
+        [&rString](const ScTypedStrData& rData) {
+            return (rData.GetStringType() != ScTypedStrData::Value)
+                && ScGlobal::GetpTransliteration()->isEqual(rData.GetString(), rString);
+        });
+    if (it != rDataSet.end())
+        return it->GetString();
     return rString;
 }
 
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 2162eb6b9f74..3e276a1c2149 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1882,11 +1882,10 @@ void ScPosWnd::FillRangeNames()
         ScRange aDummy;
         std::set<OUString> aSet;
         ScRangeName* pRangeNames = rDoc.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 < rDoc.GetTableCount(); ++i)
         {
@@ -1895,18 +1894,17 @@ void ScPosWnd::FillRangeNames()
             {
                 OUString aTableName;
                 rDoc.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)
         {
-            InsertEntry(*itr);
+            InsertEntry(rItem);
         }
     }
     SetText(aPosStr);
diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx
index 93ee2d254f0f..f0188a9fbeb3 100644
--- a/sc/source/ui/app/rfindlst.cxx
+++ b/sc/source/ui/app/rfindlst.cxx
@@ -35,12 +35,8 @@ ScRangeFindList::ScRangeFindList(const OUString& rName) :
 
 Color ScRangeFindList::Insert( const ScRangeFindData &rNew )
 {
-    std::vector<ScRangeFindData>::iterator it=maEntries.begin();
-    for( ; it!=maEntries.end(); ++it)
-    {
-        if(it->aRef == rNew.aRef)
-            break;
-    }
+    auto it = std::find_if(maEntries.begin(), maEntries.end(),
+        [&rNew](const ScRangeFindData& rEntry) { return rEntry.aRef == rNew.aRef; });
     ScRangeFindData insertData(rNew);
     insertData.nColor = ( it != maEntries.end() ? it->nColor :
                               ScRangeFindList::GetColorName( maEntries.size() ) );