diff options
Diffstat (limited to 'patches/vba/vba-xls-formula-parser.diff')
| -rw-r--r-- | patches/vba/vba-xls-formula-parser.diff | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/patches/vba/vba-xls-formula-parser.diff b/patches/vba/vba-xls-formula-parser.diff deleted file mode 100644 index 553a2bb28..000000000 --- a/patches/vba/vba-xls-formula-parser.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx -index e7f6797..0911361 100644 ---- sc/source/ui/vba/vbarange.cxx -+++ sc/source/ui/vba/vbarange.cxx -@@ -792,9 +792,10 @@ protected: - double aDblValue = 0.0; - if ( aValue >>= sFormula ) - { -- // convert to CONV_OOO style formula string because XCell::setFormula -- // always compile it in CONV_OOO style. Perhaps css.sheet.FormulaParser -- // should be used in future to directly pass formula tokens. -+ // convert to GRAM_PODF_A1 style grammar because XCell::setFormula -+ // always compile it in that grammar. Perhaps -+ // css.sheet.FormulaParser should be used in future to directly -+ // pass formula tokens when that API stabilizes. - if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) ) - { - uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW ); -@@ -1462,25 +1463,25 @@ void - ScVbaRange::setFormula(const uno::Any &rFormula ) throw (uno::RuntimeException) - { - // #FIXME converting "=$a$1" e.g. CONV_XL_A1 -> CONV_OOO // results in "=$a$1:a1", temporalily disable conversion -- setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );; -+ setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );; - } - - uno::Any - ScVbaRange::getFormulaR1C1() throw (::com::sun::star::uno::RuntimeException) - { -- return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); -+ return getFormulaValue( formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1 ); - } - - void - ScVbaRange::setFormulaR1C1(const uno::Any& rFormula ) throw (uno::RuntimeException) - { -- setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 ); -+ setFormulaValue( rFormula,formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1 ); - } - - uno::Any - ScVbaRange::getFormula() throw (::com::sun::star::uno::RuntimeException) - { -- return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 ); -+ return getFormulaValue( formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 ); - } - - sal_Int32 |