Simplify containers iterations in xmloff/source/[f-t]*

Use range-based loop or replace with STL functions.

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

3 files changed, 8 insertions, 22 deletions

diff --git a/xmloff/source/script/XMLEventExport.cxx b/xmloff/source/script/XMLEventExport.cxx
index eb0fc075c584..64e47a45919c 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -52,13 +52,9 @@ XMLEventExport::XMLEventExport(SvXMLExport& rExp) :
 XMLEventExport::~XMLEventExport()
 {
     // delete all handlers
-    HandlerMap::iterator aEnd = aHandlerMap.end();
-    for( HandlerMap::iterator aIter =
-             aHandlerMap.begin();
-         aIter != aEnd;
-         ++aIter )
+    for( auto& rEntry : aHandlerMap )
     {
-        delete aIter->second;
+        delete rEntry.second;
     }
     aHandlerMap.clear();
 }
diff --git a/xmloff/source/script/XMLEventImportHelper.cxx b/xmloff/source/script/XMLEventImportHelper.cxx
index 0e45525856af..0a719dee5d31 100644
--- a/xmloff/source/script/XMLEventImportHelper.cxx
+++ b/xmloff/source/script/XMLEventImportHelper.cxx
@@ -40,12 +40,9 @@ XMLEventImportHelper::XMLEventImportHelper() :
 XMLEventImportHelper::~XMLEventImportHelper()
 {
     // delete factories
-    FactoryMap::iterator aEnd = aFactoryMap.end();
-    for(FactoryMap::iterator aIter = aFactoryMap.begin();
-        aIter != aEnd;
-        ++aIter)
+    for(auto& rEntry : aFactoryMap)
     {
-        delete aIter->second;
+        delete rEntry.second;
     }
     aFactoryMap.clear();
 
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx b/xmloff/source/script/XMLEventsImportContext.cxx
index c5c4d1621d1e..aea5eb9e62ac 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -145,12 +145,9 @@ void XMLEventsImportContext::SetEvents(
         xEvents = xNameRepl;
 
         // now iterate over vector and a) insert b) delete all elements
-        EventsVector::iterator aEnd = aCollectEvents.end();
-        for(EventsVector::iterator aIter = aCollectEvents.begin();
-            aIter != aEnd;
-            ++aIter)
+        for(const auto& rEvent : aCollectEvents)
         {
-            AddEventValues(aIter->first, aIter->second);
+            AddEventValues(rEvent.first, rEvent.second);
         }
         aCollectEvents.clear();
     }
@@ -164,12 +161,8 @@ void XMLEventsImportContext::GetEventSequence(
     // (This shouldn't take a lot of time, since this method should only get
     //  called if only one (or few) events are being expected)
 
-    // iterate over vector until end or rName is found;
-    EventsVector::iterator aIter = aCollectEvents.begin();
-    while( (aIter != aCollectEvents.end()) && (aIter->first != rName) )
-    {
-        ++aIter;
-    }
+    auto aIter = std::find_if(aCollectEvents.begin(), aCollectEvents.end(),
+        [&rName](EventNameValuesPair& rEvent) { return rEvent.first == rName; });
 
     // if we're not at the end, set the sequence
     if (aIter != aCollectEvents.end())