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



Author: kyoshida
Date: Wed Mar  5 00:50:42 2008
New Revision: 11808
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11808&view=rev

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

	* patches/src680/sc-localized-arg-separator.diff: fixed a few things to
	get variable formula syntax to work in conditional formatting as well as
	defined names.


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	Wed Mar  5 00:50:42 2008
@@ -499,7 +499,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-04 00:30:30.000000000 -0500
++++ sc/source/core/tool/compiler.cxx	2008-03-04 19:27:24.000000000 -0500
 @@ -439,6 +439,7 @@ void ScCompiler::SetCompileEnglish( BOOL
          if (!pCharClassEnglish)
              InitCharClassEnglish();
@@ -600,7 +600,15 @@
  struct ConventionXL_A1 : public Convention_A1, public ConventionXL
  {
      ConventionXL_A1() : Convention_A1( ScAddress::CONV_XL_A1 ) { }
-@@ -1389,6 +1450,25 @@ struct ConventionXL_A1 : public Conventi
+@@ -1325,6 +1386,7 @@ struct ConventionXL_A1 : public Conventi
+                      BOOL bSingleRef ) const
+     {
+         ComplRefData aRef( rRef );
++        aRef.Ref1.CalcAbsIfRel( rComp.GetPos() );
+ 
+         MakeDocStr( rBuf, rComp, aRef, bSingleRef );
+ 
+@@ -1389,6 +1451,25 @@ struct ConventionXL_A1 : public Conventi
              MakeRowStr( rBuf, aRef.Ref2.nRow );
          }
      }
@@ -626,7 +634,7 @@
  };
  
  static const ConventionXL_A1 ConvXL_A1;
-@@ -1508,6 +1588,21 @@ struct ConventionXL_R1C1 : public ScComp
+@@ -1508,6 +1589,21 @@ struct ConventionXL_R1C1 : public ScComp
          return pCharClass->parseAnyToken( rFormula,
                  nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
      }
@@ -648,7 +656,17 @@
  };
  
  static const ConventionXL_R1C1 ConvXL_R1C1;
-@@ -1968,15 +2063,16 @@ xub_StrLen ScCompiler::NextSymbol()
+@@ -1626,7 +1722,8 @@ void ScCompiler::CheckTabQuotes( String&
+ 
+ void ScCompiler::SetCompileXML( BOOL bVal )
+ {
+-    SetRefConvention( bVal ? pConvOOO_A1_XML : pConvOOO_A1 );
++    if (bVal)
++        SetRefConvention( pConvOOO_A1_XML );
+ }
+ void ScCompiler::SetRefConvention( ScAddress::Convention eConv )
+ {
+@@ -1968,15 +2065,16 @@ xub_StrLen ScCompiler::NextSymbol()
  // Convert symbol to token
  //---------------------------------------------------------------------------
  
@@ -670,7 +688,7 @@
      }
      else
      {
-@@ -2776,8 +2872,9 @@ void ScCompiler::AutoCorrectParsedSymbol
+@@ -2776,8 +2874,9 @@ void ScCompiler::AutoCorrectParsedSymbol
      }
  }
  
@@ -681,7 +699,7 @@
      xub_StrLen nSpaces = NextSymbol();
  
  #if 0
-@@ -2836,7 +2933,7 @@ BOOL ScCompiler::NextNewToken( bool bAll
+@@ -2836,7 +2935,7 @@ BOOL ScCompiler::NextNewToken( bool bAll
              // IsReference().
              // IsBoolean before isValue to catch inline bools without the kludge
              //    for inline arrays.
@@ -690,7 +708,7 @@
                && !IsReference( aOrg )
                && !(bAllowBooleans && IsBoolean( aUpper ))
                && !IsValue( aUpper )
-@@ -2988,7 +3085,7 @@ ScTokenArray* ScCompiler::CompileString(
+@@ -2988,7 +3087,7 @@ ScTokenArray* ScCompiler::CompileString(
                  SetError(errCodeOverflow);
              }
              else if ( bAutoCorrect )
@@ -699,7 +717,7 @@
          }
  
          ScByteToken aToken( ocClose );
-@@ -2999,7 +3096,7 @@ ScTokenArray* ScCompiler::CompileString(
+@@ -2999,7 +3098,7 @@ ScTokenArray* ScCompiler::CompileString(
                  SetError(errCodeOverflow); break;
              }
              if ( bAutoCorrect )
@@ -708,7 +726,7 @@
          }
      }
      if ( nForced >= 2 )
-@@ -5001,9 +5098,17 @@ ScRangeData* ScCompiler::UpdateMoveTab( 
+@@ -5001,9 +5100,17 @@ ScRangeData* ScCompiler::UpdateMoveTab( 
  }
  
  
@@ -728,7 +746,7 @@
  }
  
  ScToken* ScCompiler::CreateStringFromToken( String& rFormula, ScToken* pTokenP,
-@@ -5046,7 +5151,7 @@ ScToken* ScCompiler::CreateStringFromTok
+@@ -5046,7 +5153,7 @@ ScToken* ScCompiler::CreateStringFromTok
      else if( eOp >= ocInternalBegin && eOp <= ocInternalEnd )
          rBuffer.appendAscii( pInternal[ eOp - ocInternalBegin ] );
      else if( (USHORT) eOp < mxSymbolsNative->getSymbolCount())        // Keyword:
@@ -737,7 +755,7 @@
      else
      {
          DBG_ERROR("Unbekannter OpCode");
-@@ -5175,20 +5280,19 @@ void ScCompiler::CreateStringFromScMatri
+@@ -5175,20 +5282,19 @@ void ScCompiler::CreateStringFromScMatri
      SCSIZE nC, nMaxC, nR, nMaxR;
  
      pMatrix->GetDimensions( nMaxC, nMaxR);
@@ -761,7 +779,7 @@
              }
  
              if( pMatrix->IsValue( nC, nR ) )
-@@ -5213,7 +5317,7 @@ void ScCompiler::CreateStringFromScMatri
+@@ -5213,7 +5319,7 @@ void ScCompiler::CreateStringFromScMatri
                  AppendString( rBuffer, pMatrix->GetString( nC, nR ) );
          }
      }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]