From d761be572b6a49dff64db47bbdda309e7b984f95 Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Wed, 7 Feb 2018 21:47:10 +0100
Subject: Use for-range loops in sfx2 (part2)

Change-Id: Ie13b5836eff2e9b5dfec4bb95935de9560ab4be0
Reviewed-on: https://gerrit.libreoffice.org/49393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sfx2/source/doc/SfxDocumentMetaData.cxx | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

(limited to 'sfx2/source/doc/SfxDocumentMetaData.cxx')

diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 9f50689b0c9e..a15ea43e0ed6 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -794,12 +794,11 @@ SfxDocumentMetaData::setMetaList(const char* i_name,
                 m_xDoc->createTextNode(i_rValue[i]), css::uno::UNO_QUERY_THROW);
             // set attributes
             if (i_pAttrs != nullptr) {
-                for (std::vector<std::pair<const char*, OUString> >
-                                ::const_iterator it = (*i_pAttrs)[i].begin();
-                        it != (*i_pAttrs)[i].end(); ++it) {
-                    xElem->setAttributeNS(getNameSpace(it->first),
-                        OUString::createFromAscii(it->first),
-                        it->second);
+                for (auto const& elem : (*i_pAttrs)[i])
+                {
+                    xElem->setAttributeNS(getNameSpace(elem.first),
+                        OUString::createFromAscii(elem.first),
+                        elem.second);
                 }
             }
             xNode->appendChild(xTextNode);
@@ -939,11 +938,10 @@ SfxDocumentMetaData::updateElement(const char *i_name,
                     css::uno::UNO_QUERY_THROW);
             xNode.set(xElem, css::uno::UNO_QUERY_THROW);
             // set attributes
-            for (std::vector<std::pair<const char *, OUString> >
-                    ::const_iterator it = i_pAttrs->begin();
-                    it != i_pAttrs->end(); ++it) {
-                xElem->setAttributeNS(getNameSpace(it->first),
-                    OUString::createFromAscii(it->first), it->second);
+            for (auto const& elem : *i_pAttrs)
+            {
+                xElem->setAttributeNS(getNameSpace(elem.first),
+                    OUString::createFromAscii(elem.first), elem.second);
             }
             m_xParent->appendChild(xNode);
         }
@@ -1163,14 +1161,14 @@ void SfxDocumentMetaData::init(
     }
 
     // user-defined meta data: initialize PropertySet from DOM nodes
-    for (std::vector<css::uno::Reference<css::xml::dom::XNode> >::iterator
-            it = vec.begin(); it != vec.end(); ++it) {
-        css::uno::Reference<css::xml::dom::XElement> xElem(*it,
+    for (auto const& elem : vec)
+    {
+        css::uno::Reference<css::xml::dom::XElement> xElem(elem,
             css::uno::UNO_QUERY_THROW);
         css::uno::Any any;
         OUString name = xElem->getAttributeNS(s_nsODFMeta, "name");
         OUString type = xElem->getAttributeNS(s_nsODFMeta, "value-type");
-        OUString text = getNodeText(*it);
+        OUString text = getNodeText(elem);
         if ( type == "float" ) {
             double d;
             if (::sax::Converter::convertDouble(d, text)) {
-- 
cgit