diff options
Diffstat (limited to 'include/formula')
| -rw-r--r-- | include/formula/FormulaCompiler.hxx | 4 | ||||
| -rw-r--r-- | include/formula/formula.hxx | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 45166193487c..ef1c058eaa4e 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -361,8 +361,8 @@ private: void InitSymbolsEnglishXL() const; /// only SymbolsEnglishXL, on demand void InitSymbolsOOXML() const; /// only SymbolsOOXML, on demand - void loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap, - SeparatorType eSepType = SeparatorType::SEMICOLON_BASE ) const; + void loadSymbols(const std::pair<const char*, int>* pSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap, + SeparatorType eSepType = SeparatorType::SEMICOLON_BASE) const; /** Check pCurrentFactorToken for nParam's (0-based) ForceArray types and set ForceArray at rCurr if so. Set nParam+1 as 1-based diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 9b6cf62ecd19..e88cd775ca57 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -89,11 +89,6 @@ protected: class FORMULA_DLLPUBLIC FormulaDlg: private OModuleClient, public SfxModelessDialog, public IFormulaEditorHelper - // order of base classes is important, as OModuleClient controls the - // lifecycle of the ResMgr passed into SfxModelessDialog (via - // formula::ModuleRes), and at least with DBG_UTIL calling TestRes in - // ~Resource, the ResMgr must outlive the Resource (from which - // SfxModelessDialog ultimately derives) { friend class FormulaDlg_Impl; public: |