commit b8a83c5c63873faf1a63205b8aad634f351d1a9f
author Eike Rathke <erack@redhat.com> Thu Sep 01 13:40:58 2022 +0200
committer Eike Rathke <erack@redhat.com> Thu Sep 01 16:29:49 2022 +0200
tree a5ec8bde42061f972eff806a24b8ce6b4a5c3676
parent 372c7b231c2d75f6d9bade63cd1b980a84391d4f

Related: tdf#142293 Use FormulaCompiler::GetFinalOpCodeMap() in ScCompiler

Change-Id: I65bf11fca11acfbc372c99a5210e0f79b61f2be4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139171
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins

sc/source/core/tool/compiler.cxx

diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ecd1dfe..d19f1b6 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -261,17 +261,17 @@ void ScCompiler::SetGrammar( const FormulaGrammar::Grammar eGrammar )
    if( eGrammar == FormulaGrammar::GRAM_EXTERNAL )
    {
        meGrammar = eGrammar;
        mxSymbols = GetOpCodeMap( css::sheet::FormulaLanguage::NATIVE);
        mxSymbols = GetFinalOpCodeMap( css::sheet::FormulaLanguage::NATIVE);
    }
    else
    {
        FormulaGrammar::Grammar eMyGrammar = eGrammar;
        const sal_Int32 nFormulaLanguage = FormulaGrammar::extractFormulaLanguage( eMyGrammar);
        OpCodeMapPtr xMap = GetOpCodeMap( nFormulaLanguage);
        OpCodeMapPtr xMap = GetFinalOpCodeMap( nFormulaLanguage);
        OSL_ENSURE( xMap, "ScCompiler::SetGrammar: unknown formula language");
        if (!xMap)
        {
            xMap = GetOpCodeMap( css::sheet::FormulaLanguage::NATIVE);
            xMap = GetFinalOpCodeMap( css::sheet::FormulaLanguage::NATIVE);
            eMyGrammar = xMap->getGrammar();
        }