1 files changed, 3 insertions, 5 deletions
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index ae78223a20fe..031bd86c3aee 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -372,12 +372,10 @@ namespace comphelper
         if (!m_aData.m_pValues || !m_aData.m_pValues->empty())
             throw RuntimeException();
 
-        const Pair< Any, Any >* mapping = _initialValues.getConstArray();
-        const Pair< Any, Any >* mappingEnd = mapping + _initialValues.getLength();
-        for ( ; mapping != mappingEnd; ++mapping )
+        for (auto& mapping : _initialValues)
         {
-            impl_checkValue_throw( mapping->Second );
-            (*m_aData.m_pValues)[ mapping->First ] = mapping->Second;
+            impl_checkValue_throw(mapping.Second);
+            (*m_aData.m_pValues)[mapping.First] = mapping.Second;
         }
     }