diff options
| author | Eike Rathke <erack@redhat.com> | 2013-11-13 16:55:48 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-11-13 17:15:59 +0100 |
| commit | debe0835cad25931a934eb3e1f205d508e6498cd (patch) | |
| tree | a80e0cc2f00c668e77f165e0289c65cc2338a1ab /sc/source/filter/oox/formulabuffer.cxx | |
| parent | a500ab2ee19a5221817c13fc8975c27fe4e92246 (diff) | |
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
Diffstat (limited to 'sc/source/filter/oox/formulabuffer.cxx')
| -rw-r--r-- | sc/source/filter/oox/formulabuffer.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 6f0c99168cb6..b9ae6b172ad5 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -76,7 +76,7 @@ public: Item& rCached = *it->second; ScCompiler aComp(&mrDoc, rPos, *rCached.mpCell->GetCode()); - aComp.SetGrammar(formula::FormulaGrammar::GRAM_ENGLISH_XL_OOX); + aComp.SetGrammar(formula::FormulaGrammar::GRAM_OOXML); OUStringBuffer aBuf; aComp.CreateStringFromTokenArray(aBuf); OUString aPredicted = aBuf.makeStringAndClear(); @@ -132,7 +132,7 @@ void applySharedFormulas( ScUnoConversion::FillScAddress(aPos, rAddr); ScCompiler aComp(&rDoc.getDoc(), aPos); aComp.SetNumberFormatter(&rFormatter); - aComp.SetGrammar(formula::FormulaGrammar::GRAM_ENGLISH_XL_OOX); + aComp.SetGrammar(formula::FormulaGrammar::GRAM_OOXML); ScTokenArray* pArray = aComp.CompileString(rTokenStr); if (pArray) { @@ -220,7 +220,7 @@ void applyCellFormulas( ScCompiler aCompiler(&rDoc.getDoc(), aPos); aCompiler.SetNumberFormatter(&rFormatter); - aCompiler.SetGrammar(formula::FormulaGrammar::GRAM_ENGLISH_XL_OOX); + aCompiler.SetGrammar(formula::FormulaGrammar::GRAM_OOXML); ScTokenArray* pCode = aCompiler.CompileString(it->maTokenStr); if (!pCode) continue; @@ -246,10 +246,10 @@ void applyArrayFormulas( ScCompiler aComp(&rDoc.getDoc(), aPos); aComp.SetNumberFormatter(&rFormatter); - aComp.SetGrammar(formula::FormulaGrammar::GRAM_ENGLISH_XL_OOX); + aComp.SetGrammar(formula::FormulaGrammar::GRAM_OOXML); boost::scoped_ptr<ScTokenArray> pArray(aComp.CompileString(it->maTokenAndAddress.maTokenStr)); if (pArray) - rDoc.setMatrixCells(aRange, *pArray, formula::FormulaGrammar::GRAM_ENGLISH_XL_OOX); + rDoc.setMatrixCells(aRange, *pArray, formula::FormulaGrammar::GRAM_OOXML); } } |