summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2008-06-09 15:49:47 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2008-06-09 15:49:47 +0000
commit6e92f66f0733db60c787cd386f9891de0aeab650 (patch)
treed9a369ec6c0e036811158081a20279c150baf73e
parent6e2658ab67eedd6369b69b5a7f65df11f68d3a07 (diff)
INTEGRATION: CWS odff03 (1.55.20); FILE MERGED
2008/05/08 22:21:13 er 1.55.20.2: RESYNC: (1.55-1.56); FILE MERGED 2008/04/10 18:01:56 er 1.55.20.1: #i86643# make COUNT ignore errors and COUNTA count errors; patch contributed by <lvyue>
-rw-r--r--sc/source/core/tool/interpr4.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 677f6abfdac2..2e0f297735a9 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: interpr4.cxx,v $
- * $Revision: 1.56 $
+ * $Revision: 1.57 $
*
* This file is part of OpenOffice.org.
*
@@ -3705,6 +3705,8 @@ StackVar ScInterpreter::Interpret()
// Functions that evaluate an error code and directly set nGlobalError to 0,
// usage: switch( OpCode ) { CASE_OCERRFUNC statements; }
#define CASE_OCERRFUNC \
+ case ocCount : \
+ case ocCount2 : \
case ocErrorType : \
case ocIsEmpty : \
case ocIsErr : \