From debe0835cad25931a934eb3e1f205d508e6498cd Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 13 Nov 2013 16:55:48 +0100 Subject: introduced FormulaGrammar::GRAM_OOXML with FormulaLanguage::OOXML FormulaLanguage::XL_ENGLISH is not OOXML, unconditionally using SymbolsEnglishXL with RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML spoils the grammars of FormulaLanguage::XL_ENGLISH that are not OOXML. Change-Id: Id885d1c033cd15dc7b11c6490be3a98500027d37 --- include/formula/grammar.hxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/formula/grammar.hxx') diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index 34a0aa619302..e3f29de543e7 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -134,6 +134,11 @@ public: ((CONV_XL_OOX + kConventionOffset) << kConventionShift) | kEnglishBit, + /// Excel OOXML with Excel OOXML reference style. + GRAM_OOXML = ::com::sun::star::sheet::FormulaLanguage::OOXML | + ((CONV_XL_OOX + + kConventionOffset) << kConventionShift) | + kEnglishBit, /// Central definition of the default grammar to be used. GRAM_DEFAULT = GRAM_NATIVE_UI, @@ -187,6 +192,7 @@ public: case GRAM_ENGLISH_XL_A1 : case GRAM_ENGLISH_XL_R1C1: case GRAM_ENGLISH_XL_OOX : + case GRAM_OOXML : return true; default: return extractFormulaLanguage( eGrammar) == GRAM_EXTERNAL; -- cgit