diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 10:17:33 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 10:17:33 +0000 |
| commit | 3725bc077ca9c69d52fd526459f7dc20f094cef8 (patch) | |
| tree | aac39cf2ddaea0bd39095b94a9920810dc590672 /sc/source/core | |
| parent | b17fb0c65ca49ebe9fa73149ff96129e3ef0a64b (diff) | |
INTEGRATION: CWS odff02 (1.9.54); FILE MERGED
2008/03/02 18:33:20 er 1.9.54.2: #i86514# move short error strings from globstr.src to compiler.src in preparation of support for error constants in formulas
2008/02/28 16:19:47 er 1.9.54.1: #i86514# preparation for additional functions and parameters not yet implemented but to be added as string resources, suppress in UI
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/tool/parclass.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index 27fa5cfe05c8..a854375447b1 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -4,9 +4,9 @@ * * $RCSfile: parclass.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2008-03-06 15:36:08 $ + * last change: $Author: kz $ $Date: 2008-03-07 11:17:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -42,6 +42,7 @@ #include "global.hxx" #include "callform.hxx" #include "addincol.hxx" +#include "funcdesc.hxx" #include <unotools/charclass.hxx> #include <tools/debug.hxx> #include <string.h> @@ -411,7 +412,7 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource() continue; // not an internal opcode or already done RunData* pRun = &pData[ pDesc->nFIndex ]; - USHORT nArgs = pDesc->nArgCount; + USHORT nArgs = pDesc->GetSuppressedArgCount(); if ( nArgs >= VAR_ARGS ) { nArgs -= VAR_ARGS - 1; @@ -472,7 +473,7 @@ void ScParameterClassification::GenerateDocumentation() BYTE nParams = GetMinimumParameters( eOp); // preset parameter count according to opcode value, with some // special handling - if ( eOp <= ocEndDiv ) + if ( eOp < SC_OPCODE_STOP_DIV ) { switch ( eOp ) { @@ -488,7 +489,9 @@ void ScParameterClassification::GenerateDocumentation() default:; } } - else if ( eOp <= ocEndBinOp ) + else if ( eOp < SC_OPCODE_STOP_ERRORS ) + aToken.SetByte(0); + else if ( eOp < SC_OPCODE_STOP_BIN_OP ) { switch ( eOp ) { @@ -500,11 +503,11 @@ void ScParameterClassification::GenerateDocumentation() aToken.SetByte(2); } } - else if ( eOp <= ocEndUnOp ) + else if ( eOp < SC_OPCODE_STOP_UN_OP ) aToken.SetByte(1); - else if ( eOp <= ocEndNoPar ) + else if ( eOp < SC_OPCODE_STOP_NO_PAR ) aToken.SetByte(0); - else if ( eOp <= ocEnd1Par ) + else if ( eOp < SC_OPCODE_STOP_1_PAR ) aToken.SetByte(1); else aToken.SetByte( nParams); |