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

[Eike Rathke (via logerrit)]

 formula/source/core/api/FormulaCompiler.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit a56d0c34716f381accbd9d2e3040a62d3583d18d
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Thu Aug 4 00:45:37 2022 +0200
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Thu Aug 4 23:43:20 2022 +0200

    Add known but not in AddInMap English names for GRAM_API, tdf#150253 
follow-up
    
    Change-Id: I1edc2a979946078e4548c0933f9b64b7a08a7e6d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137773
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <er...@redhat.com>

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index a13a7a1734e8..be926e7d521a 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1012,10 +1012,18 @@ void FormulaCompiler::loadSymbols(const std::pair<const 
char*, int>* pSymbols, F
 
     fillFromAddInMap( rxMap, eGrammar);
     // Fill from collection for AddIns not already present.
-    if ( FormulaGrammar::GRAM_ENGLISH != eGrammar )
-        fillFromAddInCollectionUpperName( rxMap);
-    else
+    if (FormulaGrammar::GRAM_ENGLISH == eGrammar)
         fillFromAddInCollectionEnglishName( rxMap);
+    else
+    {
+        fillFromAddInCollectionUpperName( rxMap);
+        if (FormulaGrammar::GRAM_API == eGrammar)
+        {
+            // Add known but not in AddInMap English names, e.g. from the
+            // PricingFunctions AddIn or any user supplied AddIn.
+            fillFromAddInCollectionEnglishName( rxMap);
+        }
+    }
 }
 
 void FormulaCompiler::fillFromAddInCollectionUpperName( const 
NonConstOpCodeMapPtr& /*xMap */) const