summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2022-08-04 00:45:37 +0200
committerEike Rathke <erack@redhat.com>2022-08-04 23:43:20 +0200
commita56d0c34716f381accbd9d2e3040a62d3583d18d (patch)
tree7952c363cd3d351ea214e38bfcb0e68ed1244a30 /formula
parent3cf7b358799dfde4da1df3f0b9d6cf726d22a22b (diff)
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 <erack@redhat.com>
Diffstat (limited to 'formula')
-rw-r--r--formula/source/core/api/FormulaCompiler.cxx14
1 files changed, 11 insertions, 3 deletions
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