ooo-build r15232 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Jan 29 03:47:03 2009
New Revision: 15232
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15232&view=rev

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

	* patches/dev300/calc-formula-variable-separators-sc.diff:
	* patches/dev300/calc-grammar-xls-english-sc.diff: fixed build breakage
	in formula.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/calc-formula-variable-separators-sc.diff
   trunk/patches/dev300/calc-grammar-xls-english-sc.diff

Modified: trunk/patches/dev300/calc-formula-variable-separators-sc.diff
==============================================================================
--- trunk/patches/dev300/calc-formula-variable-separators-sc.diff	(original)
+++ trunk/patches/dev300/calc-formula-variable-separators-sc.diff	Thu Jan 29 03:47:03 2009
@@ -15,7 +15,7 @@
 index d031c9a..5834e9e 100644
 --- formula/source/core/api/FormulaCompiler.cxx
 +++ formula/source/core/api/FormulaCompiler.cxx
-@@ -1681,6 +1681,16 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
+@@ -1681,6 +1681,17 @@ void FormulaCompiler::AppendString( rtl::OUStringBuffer& rBuffer, const String &
          rBuffer.append(sal_Unicode('"'));
      }
  }
@@ -23,10 +23,11 @@
 +void FormulaCompiler::UpdateSeparatorsNative( 
 +    const rtl::OUString& rSep, const rtl::OUString& rArrayColSep, const rtl::OUString& rArrayRowSep )
 +{
-+    InitSymbolsNative();
-+    mxSymbolsNative->putOpCode(rSep, ocSep);
-+    mxSymbolsNative->putOpCode(rArrayColSep, ocArrayColSep);
-+    mxSymbolsNative->putOpCode(rArrayRowSep, ocArrayRowSep);
++    NonConstOpCodeMapPtr xSymbolsNative;
++    lcl_fillNativeSymbols(xSymbolsNative);
++    xSymbolsNative->putOpCode(rSep, ocSep);
++    xSymbolsNative->putOpCode(rArrayColSep, ocArrayColSep);
++    xSymbolsNative->putOpCode(rArrayRowSep, ocArrayRowSep);
 +}
 +
  // -----------------------------------------------------------------------------

Modified: trunk/patches/dev300/calc-grammar-xls-english-sc.diff
==============================================================================
--- trunk/patches/dev300/calc-grammar-xls-english-sc.diff	(original)
+++ trunk/patches/dev300/calc-grammar-xls-english-sc.diff	Thu Jan 29 03:47:03 2009
@@ -28,12 +28,12 @@
                                    kConventionOffset) << kConventionShift),
 +        /// English with Excel A1 reference style.
 +        GRAM_ENGLISH_XL_A1   = ::com::sun::star::sheet::FormulaLanguage::XL_ENGLISH  |
-+                                ((ScAddress::CONV_XL_A1         +
++                                ((CONV_XL_A1         +
 +                                  kConventionOffset) << kConventionShift)            |
 +                                kEnglishBit,
 +        /// English with Excel R1C1 reference style.
 +        GRAM_ENGLISH_XL_R1C1 = ::com::sun::star::sheet::FormulaLanguage::XL_ENGLISH  |
-+                                ((ScAddress::CONV_XL_R1C1       +
++                                ((CONV_XL_R1C1       +
 +                                  kConventionOffset) << kConventionShift)            |
 +                                kEnglishBit,
          /// Central definition of the default grammar to be used.