Simplify Sequence iterations in sw/source/ui/*

Use range-based loops, STL and comphelper functions

Change-Id: I0832f526cc549c76b423f5d5d7a5d2928ce117dc
Reviewed-on: https://gerrit.libreoffice.org/75005
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov <qarkai@gmail.com>

1 files changed, 11 insertions, 21 deletions

diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index d5f925903836..07ce4b12186e 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -40,6 +40,7 @@
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
 #include <sal/log.hxx>
 #include <editeng/langitem.hxx>
@@ -246,12 +247,10 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView& rView,
         }
         Reference <XNameAccess> xCols = xColSupp->getColumns();
         Sequence<OUString> aColNames = xCols->getElementNames();
-        const OUString* pColNames = aColNames.getConstArray();
-        sal_Int32 nCount = aColNames.getLength();
-        for (sal_Int32 n = 0; n < nCount; ++n)
+        for (const OUString& rColName : aColNames)
         {
-            std::unique_ptr<SwInsDBColumn> pNew(new SwInsDBColumn( pColNames[n] ));
-            Any aCol = xCols->getByName(pColNames[n]);
+            std::unique_ptr<SwInsDBColumn> pNew(new SwInsDBColumn( rColName ));
+            Any aCol = xCols->getByName(rColName);
             Reference <XPropertySet> xCol;
             aCol >>= xCol;
             Any aType = xCol->getPropertyValue("Type");
@@ -1467,18 +1466,11 @@ static Sequence<OUString> lcl_CreateSubNames(const OUString& rSubNodeName)
 
 static OUString lcl_CreateUniqueName(const Sequence<OUString>& aNames)
 {
-    const sal_Int32 nNames = aNames.getLength();
-    sal_Int32 nIdx = nNames;
-    const OUString* pNames = aNames.getConstArray();
+    sal_Int32 nIdx = aNames.getLength();
     while(true)
     {
         const OUString sRet = "_" + OUString::number(nIdx++);
-        sal_Int32 i = 0;
-        while ( i < nNames && pNames[i] != sRet )
-        {
-            ++i;
-        }
-        if ( i >= nNames )
+        if ( comphelper::findValue(aNames, sRet) == -1 )
             return sRet;    // No match found, return unique name
     }
 }
@@ -1562,11 +1554,10 @@ void SwInsertDBColAutoPilot::ImplCommit()
         Sequence <OUString> aSubNodeNames = lcl_CreateSubNames(sColumnInsertNode);
         Sequence<PropertyValue> aSubValues(aSubNodeNames.getLength());
         PropertyValue* pSubValues = aSubValues.getArray();
-        const OUString* pSubNodeNames = aSubNodeNames.getConstArray();
-        sal_Int32 i;
+        sal_Int32 i = 0;
 
-        for( i = 0; i < aSubNodeNames.getLength(); i++)
-            pSubValues[i].Name = pSubNodeNames[i];
+        for( const OUString& rSubNodeName : aSubNodeNames)
+            pSubValues[i++].Name = rSubNodeName;
         pSubValues[0].Value <<= pColumn->sColumn;
         pSubValues[1].Value <<= i;
         pSubValues[2].Value <<= pColumn->bHasFormat;
@@ -1633,11 +1624,10 @@ void SwInsertDBColAutoPilot::Load()
 
             const OUString sSubNodeName(nodeName + "/ColumnSet/");
             Sequence <OUString> aSubNames = GetNodeNames(sSubNodeName);
-            const OUString* pSubNames = aSubNames.getConstArray();
-            for(sal_Int32 nSub = 0; nSub < aSubNames.getLength(); nSub++)
+            for(const OUString& rSubName : aSubNames)
             {
                 Sequence <OUString> aSubNodeNames =
-                    lcl_CreateSubNames(sSubNodeName + pSubNames[nSub]);
+                    lcl_CreateSubNames(sSubNodeName + rSubName);
                 Sequence< Any> aSubProps = GetProperties(aSubNodeNames);
                 const Any* pSubProps = aSubProps.getConstArray();