[Libreoffice-commits] core.git: formula/source

[Mike Kaganski]

 formula/source/core/api/FormulaCompiler.cxx |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 9c50b0ed877c4179b5820a32be742b2190d927ee
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Dec 20 05:29:58 2017 +0200

    loplugin:unusedindex
    
    Change-Id: Id69dcfde5c8b5d39c272916e7c1bcc649f720888
    Reviewed-on: https://gerrit.libreoffice.org/46829
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx
index da9ac30cc136..b0dca4d0864f 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -817,18 +817,16 @@ FormulaCompiler::OpCodeMapPtr FormulaCompiler::CreateOpCodeMap(
                         FormulaGrammar::GRAM_EXTERNAL, bEnglish), FormulaGrammar::CONV_UNSPECIFIED)));
     SvtSysLocale aSysLocale;
     const CharClass* pCharClass = (xMap->isEnglish() ? nullptr : aSysLocale.GetCharClassPtr());
-    FormulaOpCodeMapEntry const * pArr2 = rMapping.getConstArray();
-    FormulaOpCodeMapEntry const * const pStop = pArr2 + rMapping.getLength();
-    for ( ; pArr2 < pStop; ++pArr2)
+    for (auto const& rMapEntry : rMapping)
     {
-        OpCode eOp = OpCode(pArr2->Token.OpCode);
+        OpCode eOp = OpCode(rMapEntry.Token.OpCode);
         if (eOp != ocExternal)
-            xMap->putOpCode( pArr2->Name, eOp, pCharClass);
+            xMap->putOpCode( rMapEntry.Name, eOp, pCharClass);
         else
         {
             OUString aExternalName;
-            if (pArr2->Token.Data >>= aExternalName)
-                xMap->putExternal( pArr2->Name, aExternalName);
+            if (rMapEntry.Token.Data >>= aExternalName)
+                xMap->putExternal( rMapEntry.Name, aExternalName);
             else
             {
                 SAL_WARN( "formula.core", "FormulaCompiler::CreateOpCodeMap: no Token.Data external name");