GNOME.org
 

ooo-build r15222 - in branches/ooo-build-3-0-1: . patches/dev300

Author: pmladek
Date: Wed Jan 28 17:29:33 2009
New Revision: 15222
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15222&view=rev

Log:
2009-01-27  Petr Mladek  <pmladek suse cz>

	* patches/dev300/sc-string-arg.diff: restore the version from
	  ooo-build-3.0.1.0 version
	* patches/dev300/sc-string-arg-err529.diff, patches/dev300/apply:
	  put the fix of the internal error number Err:529 into separate
	  diff; put into the UbuntuOnly section (n#440808)

	  Kohei thinks that the patch is safe but I am a bit scared to add
	  such change just before the final release




Added:
   branches/ooo-build-3-0-1/patches/dev300/sc-string-arg-err529.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/NEWS
   branches/ooo-build-3-0-1/patches/dev300/apply
   branches/ooo-build-3-0-1/patches/dev300/sc-string-arg.diff

Modified: branches/ooo-build-3-0-1/NEWS
==============================================================================
--- branches/ooo-build-3-0-1/NEWS	(original)
+++ branches/ooo-build-3-0-1/NEWS	Wed Jan 28 17:29:33 2009
@@ -1,3 +1,23 @@
+ooo-build-3.0.1.1:
+
+    + bug fixes:
+	+ do not show the Err:529 internal error number (bnc#440808) [Kohei]
+	+ accelerators for the en-US locale (bnc#463733, i#97088) [Kendy]
+	+ recognize a directory as a folder with neon (i#98288) [Caolan]
+	+ shrinked strings in some dialogs (i##98164) [Andras]
+	+ fix java-set-classpath script (bnc#465250) [Petr]
+	+ file name in the mail subject (bnc#459176) [Tor]
+	+ layout dialogs localization (bnc#466065) [Jan]
+	+ SXC import crasher (bnc#467536) [Petr]
+    + l10n:
+	+ some Hungarian localization fixes [Andras]
+    + build bits:
+	+ extras and extensions packaging enhancemetns [KAMI, Tor]
+	+ printf arguments cleanup [Rafael]
+    + updated OxygenOffice bits [KAMI]
+    + Experimental:
+	+ non-cached cells treating (bnc#355685) [Kohei]
+
 ooo-build-3.0.1.0:
 
     +features:

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Wed Jan 28 17:29:33 2009
@@ -1507,6 +1507,8 @@
 ubuntu-dictionary.diff
 ubuntu-lpi.diff, i#64895, mklose
 ubuntu-sparc-hack.diff, mklose
+# do not use the  internal error number Err:529
+sc-string-arg-err529.diff, n#440808, kohei
 
 
 [ Mono ]

Added: branches/ooo-build-3-0-1/patches/dev300/sc-string-arg-err529.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/sc-string-arg-err529.diff	Wed Jan 28 17:29:33 2009
@@ -0,0 +1,40 @@
+diff -purN ooo300-m15-calc.new1/sc/source/core/inc/interpre.hxx ooo300-m15-calc.new2/sc/source/core/inc/interpre.hxx
+--- sc/source/core/inc/interpre.hxx	2009-01-28 17:36:04.000000000 +0100
++++ sc/source/core/inc/interpre.hxx	2009-01-28 17:32:24.000000000 +0100
+@@ -173,6 +173,16 @@ void ReplaceCell( ScAddress& );     // f
+ void ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab );  // for TableOp
+ BOOL IsTableOpInRange( const ScRange& );
+ ULONG GetCellNumberFormat( const ScAddress&, const ScBaseCell* );
++
++/** 
++ * @param bNoValueAsError when true, cell having no numerical value 
++ *                        (errCellNoValue) is interpreted as a legitimate
++ *                        no-value (errNoValue) error.
++ * @param bBlankAsZero when true, a cell having a blank text value is 
++ *                     interpreted as a no-value error.
++ * 
++ * @return double cell value.
++ */
+ double GetCellValue( const ScAddress&, const ScBaseCell*, bool bNoValueAsError = false, bool bBlankAsZero = false );
+ double GetCellValueOrZero( const ScAddress&, const ScBaseCell*, bool bBlankAsZero );
+ double GetValueCellValue( const ScAddress&, const ScValueCell* );
+diff -purN ooo300-m15-calc.new1/sc/source/core/tool/interpr4.cxx ooo300-m15-calc.new2/sc/source/core/tool/interpr4.cxx
+--- sc/source/core/tool/interpr4.cxx	2009-01-28 17:36:04.000000000 +0100
++++ sc/source/core/tool/interpr4.cxx	2009-01-28 17:32:24.000000000 +0100
+@@ -204,8 +204,15 @@ double ScInterpreter::GetCellValue( cons
+     USHORT nErr = nGlobalError;
+     nGlobalError = 0;
+     double nVal = GetCellValueOrZero( rPos, pCell, bBlankAsZero );
+-    if ( !nGlobalError || (!bNoValueAsError && nGlobalError == errCellNoValue) )
++    if (!nGlobalError)
++        // no global error.  good.
+         nGlobalError = nErr;
++    else if (nGlobalError == errCellNoValue)
++        // Internal cell-no-value error.  If the caller wants to treat no
++        // value as error, then we need to translate this to a legitimate
++        // error number (#VALUE!). If not, we should re-assign the prior error
++        // number.
++        nGlobalError = bNoValueAsError ? errNoValue : nErr;
+     return nVal;
+ }
+ 

Modified: branches/ooo-build-3-0-1/patches/dev300/sc-string-arg.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/sc-string-arg.diff	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/sc-string-arg.diff	Wed Jan 28 17:29:33 2009
@@ -1,29 +1,18 @@
-diff --git sc/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx
-index 474d2aa..2dc537f 100644
---- sc/source/core/inc/interpre.hxx
-+++ sc/source/core/inc/interpre.hxx
-@@ -174,8 +174,18 @@ void ReplaceCell( ScAddress& );     // for TableOp
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/inc/interpre.hxx sc/source/core/inc/interpre.hxx
+--- sc.clean/source/core/inc/interpre.hxx	2008-04-01 12:26:35.000000000 -0400
++++ sc/source/core/inc/interpre.hxx	2008-04-21 11:10:56.000000000 -0400
+@@ -192,8 +192,8 @@ void ReplaceCell( ScAddress& );     // f
  void ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab );  // for TableOp
  BOOL IsTableOpInRange( const ScRange& );
  ULONG GetCellNumberFormat( const ScAddress&, const ScBaseCell* );
 -double GetCellValue( const ScAddress&, const ScBaseCell* );
 -double GetCellValueOrZero( const ScAddress&, const ScBaseCell* );
-+
-+/** 
-+ * @param bNoValueAsError when true, cell having no numerical value 
-+ *                        (errCellNoValue) is interpreted as a legitimate
-+ *                        no-value (errNoValue) error.
-+ * @param bBlankAsZero when true, a cell having a blank text value is 
-+ *                     interpreted as a no-value error.
-+ * 
-+ * @return double cell value.
-+ */
 +double GetCellValue( const ScAddress&, const ScBaseCell*, bool bNoValueAsError = false, bool bBlankAsZero = false );
 +double GetCellValueOrZero( const ScAddress&, const ScBaseCell*, bool bBlankAsZero );
  double GetValueCellValue( const ScAddress&, const ScValueCell* );
  ScBaseCell* GetCell( const ScAddress& rPos )
      { return pDok->GetCell( rPos ); }
-@@ -314,7 +324,7 @@ StackVar GetStackType( BYTE nParam );
+@@ -332,7 +332,7 @@ StackVar GetStackType( BYTE nParam );
  BYTE GetByte() { return cPar; }
  // generiert aus DoubleRef positionsabhaengige SingleRef
  BOOL DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr );
@@ -32,12 +21,11 @@
  double GetDoubleWithDefault(double nDefault);
  BOOL IsMissing();
  BOOL GetBool() { return GetDouble() != 0.0; }
-diff --git sc/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx
-index 722ca4b..a91fc44 100644
---- sc/source/core/tool/interpr1.cxx
-+++ sc/source/core/tool/interpr1.cxx
-@@ -3064,12 +3064,13 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
-         nGlobalError = 0;
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/interpr1.cxx sc/source/core/tool/interpr1.cxx
+--- sc.clean/source/core/tool/interpr1.cxx	2008-04-01 12:26:37.000000000 -0400
++++ sc/source/core/tool/interpr1.cxx	2008-04-21 11:21:35.000000000 -0400
+@@ -3059,12 +3059,13 @@ double ScInterpreter::IterateParameters(
+     size_t nRefInList = 0;
      while (nParamCount-- > 0)
      {
 -        switch (GetStackType())
@@ -53,7 +41,7 @@
                  {
                      String aStr( PopString() );
                      sal_uInt32 nFIndex = 0;                 // damit default Land/Spr.
-@@ -3078,42 +3079,23 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
+@@ -3073,42 +3074,23 @@ double ScInterpreter::IterateParameters(
                  }
                  else
                  {
@@ -109,7 +97,7 @@
                          if ( bNull && fVal != 0.0 )
                          {
                              bNull = FALSE;
-@@ -3122,12 +3104,15 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
+@@ -3117,12 +3099,15 @@ double ScInterpreter::IterateParameters(
                          else
                              fRes += fVal;
                          break;
@@ -129,11 +117,10 @@
              case svSingleRef :
              {
                  PopSingleRef( aAdr );
-diff --git sc/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
-index fdd78da..e997cc3 100644
---- sc/source/core/tool/interpr4.cxx
-+++ sc/source/core/tool/interpr4.cxx
-@@ -199,18 +199,26 @@ double ScInterpreter::GetValueCellValue( const ScAddress& rPos, const ScValueCel
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/interpr4.cxx sc/source/core/tool/interpr4.cxx
+--- sc.clean/source/core/tool/interpr4.cxx	2008-04-01 12:26:37.000000000 -0400
++++ sc/source/core/tool/interpr4.cxx	2008-04-21 11:26:59.000000000 -0400
+@@ -203,18 +203,19 @@ double ScInterpreter::GetValueCellValue(
  }
  
  
@@ -146,15 +133,8 @@
 -    double nVal = GetCellValueOrZero( rPos, pCell );
 -    if ( !nGlobalError || nGlobalError == errCellNoValue )
 +    double nVal = GetCellValueOrZero( rPos, pCell, bBlankAsZero );
-+    if (!nGlobalError)
-+        // no global error.  good.
++    if ( !nGlobalError || (!bNoValueAsError && nGlobalError == errCellNoValue) )
          nGlobalError = nErr;
-+    else if (nGlobalError == errCellNoValue)
-+        // Internal cell-no-value error.  If the caller wants to treat no
-+        // value as error, then we need to translate this to a legitimate
-+        // error number (#VALUE!). If not, we should re-assign the prior error
-+        // number.
-+        nGlobalError = bNoValueAsError ? errNoValue : nErr;
      return nVal;
  }
  
@@ -164,7 +144,7 @@
  {
      double fValue;
      if (pCell)
-@@ -254,7 +262,7 @@ double ScInterpreter::GetCellValueOrZero( const ScAddress& rPos, const ScBaseCel
+@@ -258,7 +259,7 @@ double ScInterpreter::GetCellValueOrZero
              break;
              case  CELLTYPE_STRING:
              case  CELLTYPE_EDIT:
@@ -173,7 +153,7 @@
  // Xcl does it, but SUM(A1:A2) differs from A1+A2. No good.
              {
                  String aStr;
-@@ -265,14 +273,15 @@ double ScInterpreter::GetCellValueOrZero( const ScAddress& rPos, const ScBaseCel
+@@ -269,14 +270,15 @@ double ScInterpreter::GetCellValueOrZero
                  sal_uInt32 nFIndex = 0;                 // damit default Land/Spr.
                  if ( !pFormatter->IsNumberFormat( aStr, nFIndex, fValue ) )
                  {
@@ -191,7 +171,7 @@
                  fValue = 0.0;
          }
      }
-@@ -1561,7 +1570,7 @@ BOOL ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& r
+@@ -1565,7 +1567,7 @@ BOOL ScInterpreter::DoubleRefToPosSingle
  }
  
  
@@ -200,7 +180,7 @@
  {
      double nVal;
      switch( GetRawStackType() )
-@@ -1585,7 +1594,7 @@ double ScInterpreter::GetDouble()
+@@ -1589,7 +1591,7 @@ double ScInterpreter::GetDouble()
              ScAddress aAdr;
              PopSingleRef( aAdr );
              ScBaseCell* pCell = GetCell( aAdr );
@@ -209,11 +189,10 @@
          }
          break;
          case svDoubleRef:
-diff --git sc/source/core/tool/interpr5.cxx sc/source/core/tool/interpr5.cxx
-index 8b4eeac..bc91cca 100644
---- sc/source/core/tool/interpr5.cxx
-+++ sc/source/core/tool/interpr5.cxx
-@@ -1297,7 +1297,12 @@ void ScInterpreter::ScAdd()
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/tool/interpr5.cxx sc/source/core/tool/interpr5.cxx
+--- sc.clean/source/core/tool/interpr5.cxx	2008-04-01 12:26:37.000000000 -0400
++++ sc/source/core/tool/interpr5.cxx	2008-04-21 11:34:12.000000000 -0400
+@@ -1291,7 +1291,12 @@ void ScInterpreter::ScAdd()
          pMat2 = GetMatrix();
      else
      {
@@ -227,7 +206,7 @@
          switch ( nCurFmtType )
          {
              case NUMBERFORMAT_DATE :
-@@ -1318,7 +1323,12 @@ void ScInterpreter::ScAdd()
+@@ -1312,7 +1317,12 @@ void ScInterpreter::ScAdd()
          pMat1 = GetMatrix();
      else
      {
@@ -241,7 +220,7 @@
          switch ( nCurFmtType )
          {
              case NUMBERFORMAT_DATE :
-@@ -1492,7 +1502,12 @@ void ScInterpreter::ScSub()
+@@ -1486,7 +1496,12 @@ void ScInterpreter::ScSub()
          pMat2 = GetMatrix();
      else
      {
@@ -255,7 +234,7 @@
          switch ( nCurFmtType )
          {
              case NUMBERFORMAT_DATE :
-@@ -1513,7 +1528,12 @@ void ScInterpreter::ScSub()
+@@ -1507,7 +1521,12 @@ void ScInterpreter::ScSub()
          pMat1 = GetMatrix();
      else
      {
@@ -269,7 +248,7 @@
          switch ( nCurFmtType )
          {
              case NUMBERFORMAT_DATE :
-@@ -1607,7 +1627,12 @@ void ScInterpreter::ScMul()
+@@ -1601,7 +1620,12 @@ void ScInterpreter::ScMul()
          pMat2 = GetMatrix();
      else
      {
@@ -283,7 +262,7 @@
          switch ( nCurFmtType )
          {
              case NUMBERFORMAT_CURRENCY :
-@@ -1620,7 +1645,12 @@ void ScInterpreter::ScMul()
+@@ -1614,7 +1638,12 @@ void ScInterpreter::ScMul()
          pMat1 = GetMatrix();
      else
      {
@@ -297,7 +276,7 @@
          switch ( nCurFmtType )
          {
              case NUMBERFORMAT_CURRENCY :
-@@ -1685,7 +1715,12 @@ void ScInterpreter::ScDiv()
+@@ -1679,7 +1708,12 @@ void ScInterpreter::ScDiv()
          pMat2 = GetMatrix();
      else
      {
@@ -311,7 +290,7 @@
          // hier kein Currency uebernehmen, 123kg/456DM sind nicht DM
          nFmtCurrencyType2 = nCurFmtType;
      }
-@@ -1693,7 +1728,12 @@ void ScInterpreter::ScDiv()
+@@ -1687,7 +1721,12 @@ void ScInterpreter::ScDiv()
          pMat1 = GetMatrix();
      else
      {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]