Related: tdf#135993 Destroy temporary OpCodeMap when reading config

Initialized at FormulaCompiler base class instance it lacks AddIn
mapping and a still existing OpCodeMap prevents necessary
reinitialization from derived ScCompiler instance later.

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

1 files changed, 35 insertions, 7 deletions

diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index 5544ff8786c0..36632035602e 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -203,6 +203,26 @@ public:
      */
     OpCodeMapPtr GetOpCodeMap( const sal_Int32 nLanguage ) const;
 
+    /** Destroy the singleton OpCodeMap for formula language.
+
+        This unconditionally destroys the underlying singleton instance of the
+        map to be reinitialized again later on the next GetOpCodeMap() call.
+        Use if the base class FormulaCompiler::GetOpCodeMap() was called and
+        created the map (i.e. HasOpCodeMap() before returned false) and later a
+        derived class like ScCompiler shall initialize it including AddIns.
+
+        @param nLanguage
+            One of css::sheet::FormulaLanguage constants.
+     */
+    void DestroyOpCodeMap( const sal_Int32 nLanguage );
+
+    /** Whether the singleton OpCodeMap for formula language exists already.
+
+        @param nLanguage
+            One of css::sheet::FormulaLanguage constants.
+     */
+    bool HasOpCodeMap( const sal_Int32 nLanguage ) const;
+
     /** Create an internal symbol map from API mapping.
         @param bEnglish
             Use English number parser / formatter instead of native.
@@ -370,14 +390,22 @@ protected:
     bool mbComputeII;  // whether to attempt computing implicit intersection ranges while building the RPN array.
     bool mbMatrixFlag; // whether the formula is a matrix formula (needed for II computation)
 
+public:
+    enum InitSymbols
+    {
+        ASK = 0,
+        INIT,
+        DESTROY
+    };
+
 private:
-    void InitSymbolsNative() const;    /// only SymbolsNative, on first document creation
-    void InitSymbolsEnglish() const;   /// only SymbolsEnglish, maybe later
-    void InitSymbolsPODF() const;      /// only SymbolsPODF, on demand
-    void InitSymbolsAPI() const;       /// only SymbolsAPI, on demand
-    void InitSymbolsODFF() const;      /// only SymbolsODFF, on demand
-    void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand
-    void InitSymbolsOOXML() const;     /// only SymbolsOOXML, on demand
+    bool InitSymbolsNative( InitSymbols ) const;    /// only SymbolsNative, on first document creation
+    bool InitSymbolsEnglish( InitSymbols ) const;   /// only SymbolsEnglish, maybe later
+    bool InitSymbolsPODF( InitSymbols ) const;      /// only SymbolsPODF, on demand
+    bool InitSymbolsAPI( InitSymbols ) const;       /// only SymbolsAPI, on demand
+    bool InitSymbolsODFF( InitSymbols ) const;      /// only SymbolsODFF, on demand
+    bool InitSymbolsEnglishXL( InitSymbols ) const; /// only SymbolsEnglishXL, on demand
+    bool InitSymbolsOOXML( InitSymbols ) const;     /// only SymbolsOOXML, on demand
 
     void loadSymbols(const std::pair<const char*, int>* pSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap,
             SeparatorType eSepType = SeparatorType::SEMICOLON_BASE) const;