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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Nov 19 19:26:21 2008
New Revision: 14550
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14550&view=rev

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

	* patches/dev300/sc-string-arg-counta-fix.diff: fixed COUNTA that 
	returned error when a string literal is used as an argument (n#446622).

	* patches/dev300/apply: apply this new patch.


Added:
   branches/ooo-build-3-0/patches/dev300/sc-string-arg-counta-fix.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Nov 19 19:26:21 2008
@@ -675,6 +675,9 @@
 # being referenced by the origin cell.
 sc-string-arg-ref-formula-cell.diff, n#391330, kohei
 
+# Fix an error in presence of string literals in COUNTA.
+sc-string-arg-counta-fix.diff, n#446622, kohei
+
 # Print_Area/Print_Titles are only relevant for sheet local names, n#191005
 sc-xls-builtin-name-scope.diff, n#191005, n#257422, jonp
 

Added: branches/ooo-build-3-0/patches/dev300/sc-string-arg-counta-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/sc-string-arg-counta-fix.diff	Wed Nov 19 19:26:21 2008
@@ -0,0 +1,14 @@
+diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
+index 4f1976a..a2adbe9 100644
+--- sc/source/core/tool/interpr1.cxx
++++ sc/source/core/tool/interpr1.cxx
+@@ -3078,6 +3078,9 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, BOOL bTextAsZero )
+                     if ( bTextAsZero || pFormatter->IsNumberFormat(aStr, nFIndex, fVal))
+                         nCount++;
+                 }
++                else if (eFunc == ifCOUNT2)
++                    // COUNTA - we should count both number and string.
++                    ++nCount;
+                 else
+                 {
+                     if ( bTextAsZero && eStackType == svString )