Modernize a bit more dbaccess (part2)

mainly by using for-range loops but also by simplifying some simple algo

Change-Id: If5ce6d901761db2b872a99e6de0eb6d2f098df99
Reviewed-on: https://gerrit.libreoffice.org/51044
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

1 files changed, 12 insertions, 5 deletions

diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 366c827a9744..ddebfc064ddd 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -77,13 +77,20 @@ namespace dbaui
         if( m_pLine )
         {
             // search the position of our table window in the table window map
+            // TODO JNA Shouldn't nIndex begin at 0?
             nIndex = m_pLine->GetParent()->GetTabWinMap().size();
             const auto& rVec = m_pLine->GetParent()->getTableConnections();
-            auto aIter = rVec.begin();
-            auto aEnd = rVec.end();
-            for (; aIter != aEnd && (*aIter).get() != m_pLine; ++nIndex,++aIter)
-                ;
-            nIndex = ( aIter != aEnd ) ? nIndex : -1;
+            bool bFound = false;
+            for (auto const& elem : rVec)
+            {
+                if (elem.get() == m_pLine)
+                {
+                    bFound = true;
+                    break;
+                }
+                ++nIndex;
+            }
+            nIndex = bFound ? nIndex : -1;
         }
         return nIndex;
     }