ooo-build r15198 - in trunk: . patches/dev300 patches/vba

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Jan 28 05:27:25 2009
New Revision: 15198
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15198&view=rev

Log:
2009-01-28  Kohei Yoshida  <kyoshida novell com>

	* patches/vba/vba-xls-formula-parser-m39.diff:
	* patches/vba/vba-xls-formula-parser.diff:
	* patches/dev300/apply: adjusted for dev300-m40.



Added:
   trunk/patches/vba/vba-xls-formula-parser-m39.diff   (props changed)
      - copied unchanged from r15184, /trunk/patches/vba/vba-xls-formula-parser.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/vba/vba-xls-formula-parser.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan 28 05:27:25 2009
@@ -2099,9 +2099,17 @@
 # fix core issue in Commandbar
 vba-commandbar-fix.diff, n#434214, n#437157, Fong
 
+[ VBAObjects <= dev300-m39 ]
+# always use English Excel grammar when parsing formulas.
+# (depends on calc-grammar-xls-english-*.diff patches.)
+vba-xls-formula-parser-m39.diff, n#422145, kohei
+
+[ VBAObjects > dev300-m39 ]
 # always use English Excel grammar when parsing formulas.
 # (depends on calc-grammar-xls-english-*.diff patches.)
 vba-xls-formula-parser.diff, n#422145, kohei
+
+[ VBAObjects ]
 vba-fix-docmodule-import-crash.diff, n#447560
 
 vba-servicemacros-rework.diff

Modified: trunk/patches/vba/vba-xls-formula-parser.diff
==============================================================================
--- trunk/patches/vba/vba-xls-formula-parser.diff	(original)
+++ trunk/patches/vba/vba-xls-formula-parser.diff	Wed Jan 28 05:27:25 2009
@@ -1,9 +1,9 @@
 diff --git sc/source/ui/vba/vbarange.cxx sc/source/ui/vba/vbarange.cxx
-index 2aae16d..6b510ff 100644
+index e7f6797..0911361 100644
 --- sc/source/ui/vba/vbarange.cxx
 +++ sc/source/ui/vba/vbarange.cxx
-@@ -791,9 +791,10 @@ protected:
- 		double aDblValue;
+@@ -792,9 +792,10 @@ protected:
+ 		double aDblValue = 0.0;
  		if ( aValue >>= sFormula )
  		{
 -            // convert to CONV_OOO style formula string because XCell::setFormula
@@ -13,36 +13,36 @@
 +            // 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 != ScGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )	
+             if ( m_eGrammar != formula::FormulaGrammar::GRAM_PODF_A1 && ( sFormula.trim().indexOf('=') == 0 ) )	
  			{
  				uno::Reference< uno::XInterface > xIf( xCell, uno::UNO_QUERY_THROW );
-@@ -1459,25 +1460,25 @@ void
+@@ -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, ScGrammar::GRAM_NATIVE_XL_A1 );;
-+	setFormulaValue( rFormula, ScGrammar::GRAM_ENGLISH_XL_A1 );;
+-	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( ScGrammar::GRAM_NATIVE_XL_R1C1 );
-+	return getFormulaValue( ScGrammar::GRAM_ENGLISH_XL_R1C1 );
+-	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, ScGrammar::GRAM_NATIVE_XL_R1C1 );
-+	setFormulaValue( rFormula, ScGrammar::GRAM_ENGLISH_XL_R1C1 );
+-	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( ScGrammar::GRAM_NATIVE_XL_A1 );
-+	return getFormulaValue( ScGrammar::GRAM_ENGLISH_XL_A1 );
+-	return getFormulaValue( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
++	return getFormulaValue( formula::FormulaGrammar::GRAM_ENGLISH_XL_A1 );
  }
  
  sal_Int32