ooo-build r11955 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Thu Mar 20 01:00:56 2008
New Revision: 11955
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11955&view=rev

Log:
2008-03-19  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/sc-localized-arg-separator.diff: forgot to return 
	correct array separators for XL R1C1 formula style.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/sc-localized-arg-separator.diff

Modified: trunk/patches/src680/sc-localized-arg-separator.diff
==============================================================================
--- trunk/patches/src680/sc-localized-arg-separator.diff	(original)
+++ trunk/patches/src680/sc-localized-arg-separator.diff	Thu Mar 20 01:00:56 2008
@@ -505,7 +505,7 @@
  			}
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
 --- sc.clean/source/core/tool/compiler.cxx	2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/tool/compiler.cxx	2008-03-05 12:07:38.000000000 -0500
++++ sc/source/core/tool/compiler.cxx	2008-03-19 20:54:49.000000000 -0400
 @@ -439,6 +439,7 @@ void ScCompiler::SetCompileEnglish( BOOL
          if (!pCharClassEnglish)
              InitCharClassEnglish();
@@ -640,7 +640,7 @@
  };
  
  static const ConventionXL_A1 ConvXL_A1;
-@@ -1508,6 +1589,21 @@ struct ConventionXL_R1C1 : public ScComp
+@@ -1508,6 +1589,25 @@ struct ConventionXL_R1C1 : public ScComp
          return pCharClass->parseAnyToken( rFormula,
                  nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
      }
@@ -651,6 +651,10 @@
 +        {
 +            case ocSep:
 +                return ConventionXL::maSep;
++            case ocArrayRowSep:
++                return ConventionXL::maArrayRowSep;
++            case ocArrayColSep:
++                return ConventionXL::maArrayColSep;
 +        }
 +        return rpMap->getSymbol(e);
 +    }
@@ -662,7 +666,7 @@
  };
  
  static const ConventionXL_R1C1 ConvXL_R1C1;
-@@ -1626,7 +1722,8 @@ void ScCompiler::CheckTabQuotes( String&
+@@ -1626,7 +1726,8 @@ void ScCompiler::CheckTabQuotes( String&
  
  void ScCompiler::SetCompileXML( BOOL bVal )
  {
@@ -672,7 +676,7 @@
  }
  void ScCompiler::SetRefConvention( ScAddress::Convention eConv )
  {
-@@ -1968,15 +2065,16 @@ xub_StrLen ScCompiler::NextSymbol()
+@@ -1968,15 +2069,16 @@ xub_StrLen ScCompiler::NextSymbol()
  // Convert symbol to token
  //---------------------------------------------------------------------------
  
@@ -694,7 +698,7 @@
      }
      else
      {
-@@ -2776,8 +2874,9 @@ void ScCompiler::AutoCorrectParsedSymbol
+@@ -2776,8 +2878,9 @@ void ScCompiler::AutoCorrectParsedSymbol
      }
  }
  
@@ -705,7 +709,7 @@
      xub_StrLen nSpaces = NextSymbol();
  
  #if 0
-@@ -2836,7 +2935,7 @@ BOOL ScCompiler::NextNewToken( bool bAll
+@@ -2836,7 +2939,7 @@ BOOL ScCompiler::NextNewToken( bool bAll
              // IsReference().
              // IsBoolean before isValue to catch inline bools without the kludge
              //    for inline arrays.
@@ -714,7 +718,7 @@
                && !IsReference( aOrg )
                && !(bAllowBooleans && IsBoolean( aUpper ))
                && !IsValue( aUpper )
-@@ -2988,7 +3087,7 @@ ScTokenArray* ScCompiler::CompileString(
+@@ -2988,7 +3091,7 @@ ScTokenArray* ScCompiler::CompileString(
                  SetError(errCodeOverflow);
              }
              else if ( bAutoCorrect )
@@ -723,7 +727,7 @@
          }
  
          ScByteToken aToken( ocClose );
-@@ -2999,7 +3098,7 @@ ScTokenArray* ScCompiler::CompileString(
+@@ -2999,7 +3102,7 @@ ScTokenArray* ScCompiler::CompileString(
                  SetError(errCodeOverflow); break;
              }
              if ( bAutoCorrect )
@@ -732,7 +736,7 @@
          }
      }
      if ( nForced >= 2 )
-@@ -5001,9 +5100,17 @@ ScRangeData* ScCompiler::UpdateMoveTab( 
+@@ -5001,9 +5104,17 @@ ScRangeData* ScCompiler::UpdateMoveTab( 
  }
  
  
@@ -752,7 +756,7 @@
  }
  
  ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pTokenP,
-@@ -5046,7 +5153,7 @@ ScToken* ScCompiler::CreateStringFromTok
+@@ -5046,7 +5157,7 @@ ScToken* ScCompiler::CreateStringFromTok
      else if( eOp >= ocInternalBegin && eOp <= ocInternalEnd )
          rBuffer.appendAscii( pInternal[ eOp - ocInternalBegin ] );
      else if( (USHORT) eOp < mxSymbolsNative->getSymbolCount())        // Keyword:
@@ -761,7 +765,7 @@
      else
      {
          DBG_ERROR("Unbekannter OpCode");
-@@ -5175,20 +5282,19 @@ void ScCompiler::CreateStringFromScMatri
+@@ -5175,20 +5286,19 @@ void ScCompiler::CreateStringFromScMatri
      SCSIZE nC, nMaxC, nR, nMaxR;
  
      pMatrix->GetDimensions( nMaxC, nMaxR);
@@ -785,7 +789,7 @@
              }
  
              if( pMatrix->IsValue( nC, nR ) )
-@@ -5213,7 +5319,7 @@ void ScCompiler::CreateStringFromScMatri
+@@ -5213,7 +5323,7 @@ void ScCompiler::CreateStringFromScMatri
                  AppendString( rBuffer, pMatrix->GetString( nC, nR ) );
          }
      }
@@ -796,7 +800,7 @@
  void ScCompiler::AppendBoolean( rtl::OUStringBuffer& rBuffer, bool bVal )
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/docoptio.cxx sc/source/core/tool/docoptio.cxx
 --- sc.clean/source/core/tool/docoptio.cxx	2008-03-03 11:24:50.000000000 -0500
-+++ sc/source/core/tool/docoptio.cxx	2008-03-19 18:42:22.000000000 -0400
++++ sc/source/core/tool/docoptio.cxx	2008-03-19 20:37:44.000000000 -0400
 @@ -50,6 +50,7 @@
  #include "scresid.hxx"
  #include "sc.hrc"
@@ -1184,6 +1188,9 @@
  };
  
  /**************************************************************************/
+Only in sc/source/ui/view: tabvwshf.cxx.~1.13.~
+Only in sc/util: makefile.mk.~1.45.~
+Only in officecfg: officecfg.argsep
 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=officecfg.vpj officecfg.clean/registry/schema/org/openoffice/Office/Calc.xcs officecfg/registry/schema/org/openoffice/Office/Calc.xcs
 --- officecfg.clean/registry/schema/org/openoffice/Office/Calc.xcs	2008-03-03 11:28:58.000000000 -0500
 +++ officecfg/registry/schema/org/openoffice/Office/Calc.xcs	2008-03-19 18:32:54.000000000 -0400