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

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Aug 11 21:22:34 2008
New Revision: 13521
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13521&view=rev

Log:
2008-08-11  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/calc-external-defined-names.diff: fixed a build 
	breakage on openSUSE 10.3.  (Funny that it built fine on 11.0.)


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/calc-external-defined-names.diff

Modified: trunk/patches/dev300/calc-external-defined-names.diff
==============================================================================
--- trunk/patches/dev300/calc-external-defined-names.diff	(original)
+++ trunk/patches/dev300/calc-external-defined-names.diff	Mon Aug 11 21:22:34 2008
@@ -90,7 +90,7 @@
  /*** error constants #... ***/
  #define SC_OPCODE_START_ERRORS       30
 diff --git sc/inc/compiler.hxx sc/inc/compiler.hxx
-index 2d816d1..2549880 100644
+index 644989b..47df0ca 100644
 --- sc/inc/compiler.hxx
 +++ sc/inc/compiler.hxx
 @@ -45,6 +45,7 @@
@@ -160,7 +160,7 @@
          enum SpecialSymbolType
          {
              /** 
-@@ -447,6 +479,7 @@ private:
+@@ -448,6 +480,7 @@ private:
      BOOL IsDoubleReference( const String& );
      BOOL IsMacro( const String& );
      BOOL IsNamedRange( const String& );
@@ -169,10 +169,10 @@
      BOOL IsColRowName( const String& );
      BOOL IsBoolean( const String& );
 diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 85d9fd4..cf11460 100644
+index 80fc25c..a5c0240 100644
 --- sc/inc/document.hxx
 +++ sc/inc/document.hxx
-@@ -93,6 +93,7 @@ class ScDocProtection;
+@@ -93,6 +93,7 @@ class ScDocOptions;
  class ScDocumentPool;
  class ScDrawLayer;
  class ScExtDocOptions;
@@ -697,7 +697,7 @@
  				ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex( t->GetIndex() );
  				if( pRangeData )
 diff --git sc/source/core/data/documen2.cxx sc/source/core/data/documen2.cxx
-index bfd615c..2287033 100644
+index 050e413..d9dccd9 100644
 --- sc/source/core/data/documen2.cxx
 +++ sc/source/core/data/documen2.cxx
 @@ -93,6 +93,7 @@
@@ -1376,7 +1376,7 @@
  }
  
 diff --git sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
-index 084f533..c320d37 100644
+index ee424fd..efaf1dc 100644
 --- sc/source/core/tool/compiler.cxx
 +++ sc/source/core/tool/compiler.cxx
 @@ -74,9 +74,11 @@
@@ -1563,14 +1563,14 @@
 +    {
 +        size_t nCount = rTabNames.size();
 +        vector<String>::const_iterator itrBeg = rTabNames.begin(), itrEnd = rTabNames.end();
-+        vector<String>::const_iterator itr = find(itrBeg, itrEnd, rTabName1);
++        vector<String>::const_iterator itr = ::std::find(itrBeg, itrEnd, rTabName1);
 +        if (itr == rTabNames.end())
 +        {
 +            rTabName2 = ScGlobal::GetRscString(STR_NO_REF_TABLE);
 +            return false;    
 +        }
 +
-+        size_t nDist = distance(itrBeg, itr);
++        size_t nDist = ::std::distance(itrBeg, itr);
 +        if (nDist + static_cast<size_t>(nTabSpan) >= nCount)
 +        {
 +            rTabName2 = ScGlobal::GetRscString(STR_NO_REF_TABLE);
@@ -2044,7 +2044,7 @@
  };
  
  static const ConventionXL_R1C1 ConvXL_R1C1;
-@@ -2179,7 +2709,7 @@ xub_StrLen ScCompiler::NextSymbol(bool bInArray)
+@@ -2181,7 +2711,7 @@ xub_StrLen ScCompiler::NextSymbol(bool bInArray)
                      static const int kQuote = kInc * 2;
                      static const int kPast = kInc * 3;
                      bool bAddToSymbol = true;
@@ -2053,7 +2053,7 @@
                      {
                          // eat it, no sheet name
                          bAddToSymbol = false;
-@@ -2194,7 +2724,7 @@ xub_StrLen ScCompiler::NextSymbol(bool bInArray)
+@@ -2196,7 +2726,7 @@ xub_StrLen ScCompiler::NextSymbol(bool bInArray)
                      }
                      else if (nRefInSheetName < kPast)
                      {
@@ -2062,7 +2062,7 @@
                              nRefInSheetName += kDollar;
                          else if ('\'' == c)
                          {
-@@ -2516,7 +3046,8 @@ BOOL ScCompiler::IsDoubleReference( const String& rName )
+@@ -2518,7 +3048,8 @@ BOOL ScCompiler::IsDoubleReference( const String& rName )
  {
      ScRange aRange( aPos, aPos );
      const ScAddress::Details aDetails( pConv->meConv, aPos );
@@ -2072,7 +2072,7 @@
      if( nFlags & SCA_VALID )
      {
          ScRawToken aToken;
-@@ -2535,7 +3066,14 @@ BOOL ScCompiler::IsDoubleReference( const String& rName )
+@@ -2537,7 +3068,14 @@ BOOL ScCompiler::IsDoubleReference( const String& rName )
              aRef.Ref2.SetTabDeleted( TRUE );        // #REF!
          aRef.Ref2.SetFlag3D( ( nFlags & SCA_TAB2_3D ) != 0 );
          aRef.CalcRelFromAbs( aPos );
@@ -2088,7 +2088,7 @@
          pRawToken = aToken.Clone();
      }
  
-@@ -2547,7 +3085,8 @@ BOOL ScCompiler::IsSingleReference( const String& rName )
+@@ -2549,7 +3087,8 @@ BOOL ScCompiler::IsSingleReference( const String& rName )
  {
      ScAddress aAddr( aPos );
      const ScAddress::Details aDetails( pConv->meConv, aPos );
@@ -2098,7 +2098,7 @@
      // Something must be valid in order to recognize Sheet1.blah or blah.a1
      // as a (wrong) reference.
      if( nFlags & ( SCA_VALID_COL|SCA_VALID_ROW|SCA_VALID_TAB ) )
-@@ -2571,7 +3110,11 @@ BOOL ScCompiler::IsSingleReference( const String& rName )
+@@ -2573,7 +3112,11 @@ BOOL ScCompiler::IsSingleReference( const String& rName )
              nFlags |= SCA_VALID;
          }
          aRef.CalcRelFromAbs( aPos );
@@ -2111,7 +2111,7 @@
          pRawToken = aToken.Clone();
      }
  
-@@ -2679,6 +3222,27 @@ BOOL ScCompiler::IsNamedRange( const String& rUpperName )
+@@ -2681,6 +3224,27 @@ BOOL ScCompiler::IsNamedRange( const String& rUpperName )
          return FALSE;
  }
  
@@ -2139,7 +2139,7 @@
  BOOL ScCompiler::IsDBRange( const String& rName )
  {
      USHORT n;
-@@ -3277,6 +3841,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
+@@ -3279,6 +3843,7 @@ BOOL ScCompiler::NextNewToken( bool bInArray )
                && !(bAllowBooleans && IsBoolean( aUpper ))
                && !IsValue( aUpper )
                && !IsNamedRange( aUpper )
@@ -2147,7 +2147,7 @@
                && !IsDBRange( aUpper )
                && !IsColRowName( aUpper )
                && !(bMayBeFuncName && IsMacro( aUpper ))
-@@ -3603,6 +4168,67 @@ BOOL ScCompiler::GetToken()
+@@ -3614,6 +4179,67 @@ BOOL ScCompiler::GetToken()
      }
      if( pToken->GetOpCode() == ocSubTotal )
          glSubTotal = TRUE;
@@ -2215,7 +2215,7 @@
      else if( pToken->GetOpCode() == ocName )
      {
          ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex( pToken->GetIndex() );
-@@ -5600,111 +6226,140 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
+@@ -5611,111 +6237,140 @@ ScToken* ScCompiler::CreateStringFromToken( rtl::OUStringBuffer& rBuffer, ScToke
          DBG_ERRORFILE("unknown OpCode");
          rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
      }