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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Jul 22 15:57:16 2008
New Revision: 13351
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13351&view=rev

Log:
2008-07-22  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/apply: apply this new patch.
	
	* patches/dev300/calc-formula-variable-separators-sc.diff: fixed a hunk
	and regenerated the patch.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/calc-formula-variable-separators-sc.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 22 15:57:16 2008
@@ -1800,6 +1800,9 @@
 # Move cell notes along with the anchored cells when cells are sorted.
 sc-sort-cell-note-position.diff, i#59745, kohei
 
+# Make the formula separators changeable per locale setting.
+calc-formula-variable-separators-sc.diff, kohei
+
 #[ OOXSTLport5 ]
 #
 ## oox devs, please reconsider operator[] use,

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	Tue Jul 22 15:57:16 2008
@@ -1,8 +1,8 @@
 diff --git sc/inc/compiler.hxx sc/inc/compiler.hxx
-index 047ff2c..5a7fb4e 100644
+index 33dbde0..2d816d1 100644
 --- sc/inc/compiler.hxx
 +++ sc/inc/compiler.hxx
-@@ -430,7 +430,7 @@ private:
+@@ -418,7 +418,7 @@ private:
      ScGrammar::Grammar  meGrammar;          // The grammar used, language plus convention.
  
      BOOL   GetToken();
@@ -11,7 +11,7 @@
      OpCode NextToken();
      void PutCode( ScTokenRef& );
      void Factor();
-@@ -448,9 +448,9 @@ private:
+@@ -436,9 +436,9 @@ private:
      OpCode Expression();
  
      void SetError(USHORT nError);
@@ -24,7 +24,7 @@
      BOOL IsString();
      BOOL IsReference( const String& );
 diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index c2d36c4..c9ae080 100644
+index d1ceb26..00c93e0 100644
 --- sc/source/core/tool/compiler.cxx
 +++ sc/source/core/tool/compiler.cxx
 @@ -42,6 +42,7 @@
@@ -35,7 +35,7 @@
  #include <com/sun/star/lang/Locale.hpp>
  #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
  #include <com/sun/star/sheet/FormulaLanguage.hpp>
-@@ -223,16 +224,16 @@ private:
+@@ -219,16 +220,16 @@ private:
      void putDefaultOpCode( ScCompiler::NonConstOpCodeMapPtr xMap, USHORT nOp );
  
  private:
@@ -59,7 +59,7 @@
  {
      init(xMap->getGrammar());
  
-@@ -248,21 +249,59 @@ ScOpCodeList::ScOpCodeList( USHORT nRID, ScCompiler::NonConstOpCodeMapPtr xMap )
+@@ -244,21 +245,59 @@ ScOpCodeList::ScOpCodeList( USHORT nRID, ScCompiler::NonConstOpCodeMapPtr xMap )
      FreeResource();
  }
  
@@ -130,7 +130,7 @@
  #endif
  }
  
-@@ -270,50 +309,16 @@ bool ScOpCodeList::getOpCodeString( String& rStr, USHORT nOp )
+@@ -266,50 +305,16 @@ bool ScOpCodeList::getOpCodeString( String& rStr, USHORT nOp )
  {
      switch (nOp)
      {
@@ -190,7 +190,7 @@
      return false;
  }
  
-@@ -1946,7 +1951,7 @@ sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode* pDst, const sal_Unicode* pSrc, xub
+@@ -1864,7 +1869,7 @@ sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode* pDst, const sal_Unicode* pSrc, xub
  //               | Sonst             | Symbol=Symbol+Zeichen | GetString
  //---------------+-------------------+-----------------------+---------------
  
@@ -199,7 +199,7 @@
  {
      cSymbol[MAXSTRLEN-1] = 0;       // Stopper
      sal_Unicode* pSym = cSymbol;
-@@ -1959,6 +1964,8 @@ xub_StrLen ScCompiler::NextSymbol()
+@@ -1877,6 +1882,8 @@ xub_StrLen ScCompiler::NextSymbol()
      ScanState eState = ssGetChar;
      xub_StrLen nSpaces = 0;
      sal_Unicode cSep = mxSymbols->getSymbol( ocSep).GetChar(0);
@@ -208,7 +208,7 @@
      sal_Unicode cDecSep = (mxSymbols->isEnglish() ? '.' :
              ScGlobal::pLocaleData->getNumDecimalSep().GetChar(0));
  
-@@ -1974,9 +1981,9 @@ xub_StrLen ScCompiler::NextSymbol()
+@@ -1893,9 +1900,9 @@ xub_StrLen ScCompiler::NextSymbol()
      {
          pSrc++;
          ULONG nMask = GetCharTableFlags( c );
@@ -221,7 +221,7 @@
          {
              switch (eState)
              {
-@@ -2322,14 +2329,22 @@ xub_StrLen ScCompiler::NextSymbol()
+@@ -2270,14 +2277,22 @@ xub_StrLen ScCompiler::NextSymbol()
  // Convert symbol to token
  //---------------------------------------------------------------------------
  
@@ -246,7 +246,7 @@
          pRawToken = aToken.Clone();
      }
      else
-@@ -3220,9 +3235,10 @@ void ScCompiler::AutoCorrectParsedSymbol()
+@@ -3146,9 +3161,10 @@ void ScCompiler::AutoCorrectParsedSymbol()
      }
  }
  
@@ -259,12 +259,12 @@
  
  #if 0
      fprintf( stderr, "NextNewToken '%s' (spaces = %d)\n",
-@@ -3303,7 +3319,7 @@ BOOL ScCompiler::NextNewToken( bool bAllowBooleans )
+@@ -3229,7 +3245,7 @@ BOOL ScCompiler::NextNewToken( bool bAllowBooleans )
              // IsReference().
              // IsBoolean before isValue to catch inline bools without the kludge
              //    for inline arrays.
 -            if ( !(bMayBeFuncName && IsOpCode( aUpper ))
 +            if ( !(bMayBeFuncName && IsOpCode( aUpper, bInArray ))
-               && !IsReference(aOrg)
+               && !IsReference( aOrg )
                && !(bAllowBooleans && IsBoolean( aUpper ))
                && !IsValue( aUpper )