ooo-build r11515 - trunk/patches/test

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Feb  6 02:36:08 2008
New Revision: 11515
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11515&view=rev

Log:
slightly better patch.

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

Modified: trunk/patches/test/sc-localized-arg-separator.diff
==============================================================================
--- trunk/patches/test/sc-localized-arg-separator.diff	(original)
+++ trunk/patches/test/sc-localized-arg-separator.diff	Wed Feb  6 02:36:08 2008
@@ -74,8 +74,16 @@
          mbAdjustHeightEnabled( true ),
 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-02-05 11:16:59.000000000 -0500
-+++ sc/source/core/tool/compiler.cxx	2008-02-05 20:12:26.000000000 -0500
-@@ -928,7 +928,7 @@ for (i = 97; i < 123; i++)
++++ sc/source/core/tool/compiler.cxx	2008-02-05 21:31:52.000000000 -0500
+@@ -439,6 +439,7 @@ void ScCompiler::SetCompileEnglish( BOOL
+         if (!pCharClassEnglish)
+             InitCharClassEnglish();
+         pCharClass = pCharClassEnglish;
++        SetRefConvention(ScAddress::CONV_OOO); // hack!  when compiling English, it's most likely handling ODF formula syntax.
+     }
+     else
+     {
+@@ -928,7 +929,7 @@ for (i = 97; i < 123; i++)
  /* ) */     t[41] |=   SC_COMPILER_C_WORD;
  /* * */     t[42] |=   SC_COMPILER_C_WORD;
  /* + */     t[43] |=   SC_COMPILER_C_WORD;
@@ -84,7 +92,7 @@
  /* , */     t[44]  =   SC_COMPILER_C_CHAR | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP;
  #else
  /* , */     t[44] |=   SC_COMPILER_C_WORD;
-@@ -980,6 +980,20 @@ struct Convention_A1 : public ScCompiler
+@@ -980,6 +981,21 @@ struct Convention_A1 : public ScCompiler
          return pCharClass->parseAnyToken( rFormula,
                  nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
      }
@@ -96,6 +104,7 @@
 +
 +    virtual OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName ) const
 +    {
++        fprintf(stdout, "Convention_A1::GetOpCode: OOO A1\n");fflush(stdout);
 +        const ScOpCodeHashMap* pHashMap = rpMap->getHashMap();
 +        ScOpCodeHashMap::const_iterator itr = pHashMap->find(rName);
 +        if (itr == pHashMap->end())
@@ -105,7 +114,7 @@
  };
  
  String Convention_A1::MakeColStr( SCCOL nCol )
-@@ -1232,6 +1246,8 @@ static const ScCompiler::Convention *pCo
+@@ -1232,6 +1248,8 @@ static const ScCompiler::Convention *pCo
  
  struct ConventionXL
  {
@@ -114,7 +123,7 @@
      static bool GetDocAndTab( const ScCompiler& rComp,
                                const SingleRefData& rRef,
                                String& rDocName,
-@@ -1316,6 +1332,8 @@ struct ConventionXL
+@@ -1316,6 +1334,8 @@ struct ConventionXL
      }
  };
  
@@ -123,7 +132,7 @@
  struct ConventionXL_A1 : public Convention_A1, public ConventionXL
  {
      ConventionXL_A1() : Convention_A1( ScAddress::CONV_XL_A1 ) { }
-@@ -1389,6 +1407,30 @@ struct ConventionXL_A1 : public Conventi
+@@ -1389,6 +1409,37 @@ struct ConventionXL_A1 : public Conventi
              MakeRowStr( rBuf, aRef.Ref2.nRow );
          }
      }
@@ -140,6 +149,7 @@
 +
 +    virtual OpCode GetOpCode( const ScCompiler::OpCodeMapPtr& rpMap, const String& rName ) const
 +    {
++        fprintf(stdout, "ConventionXL_A1::GetOpCode: XL A1\n");fflush(stdout);
 +        const ScOpCodeHashMap* pHashMap = rpMap->getHashMap();
 +        ScOpCodeHashMap::const_iterator itr = pHashMap->find(rName);
 +        if (itr == pHashMap->end())
@@ -149,12 +159,18 @@
 +                return ocSep;
 +            return ocNone;
 +        }
++
++        switch (itr->second)
++        {
++            case ocSep:
++                return ocNone;
++        }
 +        return itr->second;
 +    }
  };
  
  static const ConventionXL_A1 ConvXL_A1;
-@@ -1508,6 +1550,30 @@ struct ConventionXL_R1C1 : public ScComp
+@@ -1508,6 +1559,36 @@ struct ConventionXL_R1C1 : public ScComp
          return pCharClass->parseAnyToken( rFormula,
                  nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed );
      }
@@ -180,12 +196,18 @@
 +                return ocSep;
 +            return ocNone;
 +        }
++
++        switch (itr->second)
++        {
++            case ocSep:
++                return ocNone;
++        }
 +        return itr->second;
 +    }
  };
  
  static const ConventionXL_R1C1 ConvXL_R1C1;
-@@ -1970,13 +2036,14 @@ xub_StrLen ScCompiler::NextSymbol()
+@@ -1970,13 +2051,14 @@ xub_StrLen ScCompiler::NextSymbol()
  
  BOOL ScCompiler::IsOpCode( const String& rName )
  {
@@ -204,7 +226,7 @@
      }
      else
      {
-@@ -5046,7 +5113,7 @@ ScToken* ScCompiler::CreateStringFromTok
+@@ -5046,7 +5128,7 @@ ScToken* ScCompiler::CreateStringFromTok
      else if( eOp >= ocInternalBegin && eOp <= ocInternalEnd )
          rBuffer.appendAscii( pInternal[ eOp - ocInternalBegin ] );
      else if( (USHORT) eOp < mxSymbolsNative->getSymbolCount())        // Keyword:
@@ -213,3 +235,15 @@
      else
      {
          DBG_ERROR("Unbekannter OpCode");
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/filter/inc/fdumper.hxx sc/source/filter/inc/fdumper.hxx
+--- sc.clean/source/filter/inc/fdumper.hxx	2008-02-05 11:16:59.000000000 -0500
++++ sc/source/filter/inc/fdumper.hxx	2008-02-05 16:47:29.000000000 -0500
+@@ -36,7 +36,7 @@
+ #ifndef SC_FDUMPER_HXX
+ #define SC_FDUMPER_HXX
+ 
+-#define SCF_INCL_DUMPER (OSL_DEBUG_LEVEL > 0)
++#define SCF_INCL_DUMPER (OSL_DEBUG_LEVEL > 0) && 0
+ 
+ #if SCF_INCL_DUMPER
+