diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:28:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:28:30 +0000 |
| commit | 69dd7d34af8bec2abc1dd787a58178da6fe9fd2e (patch) | |
| tree | c663404fd4db147bc4b61f697170525300a288e7 /sc/source/core/src/compiler.src | |
| parent | 97a02660b732025e7870562956702159950e1392 (diff) | |
INTEGRATION: CWS odff (1.54.64); FILE MERGED
2008/01/03 20:27:43 er 1.54.64.3: looks like we should continue to support MULTIRANGE for legacy reasons
2007/12/17 15:59:33 er 1.54.64.2: #i32341# union / range list operator ocUnion; first wave
2007/12/07 14:35:27 er 1.54.64.1: #i81063# OpCodeMap: update/join/merge relevant parts from cws xmlfilter02
Diffstat (limited to 'sc/source/core/src/compiler.src')
| -rw-r--r-- | sc/source/core/src/compiler.src | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/core/src/compiler.src b/sc/source/core/src/compiler.src index 9c1390aa6397..f640c2bf7d1b 100644 --- a/sc/source/core/src/compiler.src +++ b/sc/source/core/src/compiler.src @@ -4,9 +4,9 @@ * * $RCSfile: compiler.src,v $ * - * $Revision: 1.55 $ + * $Revision: 1.56 $ * - * last change: $Author: obo $ $Date: 2008-01-10 13:12:31 $ + * last change: $Author: kz $ $Date: 2008-03-06 15:28:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,7 +74,7 @@ Resource RID_SC_FUNCTION_NAMES Text [ en-US ] = "OR" ; }; String SC_OPCODE_INTERSECT { Text = "!" ; }; - String SC_OPCODE_UNION { Text = ";" ; }; + String SC_OPCODE_UNION { Text = "~" ; }; String SC_OPCODE_RANGE { Text = ":" ; }; String SC_OPCODE_NOT { @@ -803,7 +803,7 @@ Resource RID_SC_FUNCTION_NAMES { Text [ en-US ] = "HLOOKUP" ; }; - String SC_OPCODE_MULTI_AREA // TODO: legacy for range list (union), remove if done. + String SC_OPCODE_MULTI_AREA // legacy for range list (union) { Text [ en-US ] = "MULTIRANGE" ; }; @@ -1201,7 +1201,7 @@ Resource RID_SC_FUNCTION_NAMES_ENGLISH String SC_OPCODE_AND { Text = "AND" ; }; String SC_OPCODE_OR { Text = "OR" ; }; String SC_OPCODE_INTERSECT { Text = "!" ; }; - String SC_OPCODE_UNION { Text = ";" ; }; + String SC_OPCODE_UNION { Text = "~" ; }; String SC_OPCODE_RANGE { Text = ":" ; }; String SC_OPCODE_NOT { Text = "NOT" ; }; String SC_OPCODE_NEG { Text = "NEG" ; }; @@ -1385,7 +1385,7 @@ Resource RID_SC_FUNCTION_NAMES_ENGLISH String SC_OPCODE_LOOKUP { Text = "LOOKUP" ; }; String SC_OPCODE_V_LOOKUP { Text = "VLOOKUP" ; }; String SC_OPCODE_H_LOOKUP { Text = "HLOOKUP" ; }; - String SC_OPCODE_MULTI_AREA { Text = "MULTIRANGE" ; }; // TODO: legacy for range list (union), remove if done. + String SC_OPCODE_MULTI_AREA { Text = "MULTIRANGE" ; }; // legacy for range list (union) String SC_OPCODE_OFFSET { Text = "OFFSET" ; }; String SC_OPCODE_INDEX { Text = "INDEX" ; }; String SC_OPCODE_AREAS { Text = "AREAS" ; }; @@ -1693,7 +1693,7 @@ Resource RID_SC_FUNCTION_NAMES_ENGLISH_ODFF String SC_OPCODE_LOOKUP { Text = "LOOKUP" ; }; String SC_OPCODE_V_LOOKUP { Text = "VLOOKUP" ; }; String SC_OPCODE_H_LOOKUP { Text = "HLOOKUP" ; }; - String SC_OPCODE_MULTI_AREA { Text = "MULTIRANGE" ; }; // TODO: legacy for range list (union), remove if done. + String SC_OPCODE_MULTI_AREA { Text = "ORG.OPENOFFICE.MULTIRANGE" ; }; // legacy for range list (union) String SC_OPCODE_OFFSET { Text = "OFFSET" ; }; String SC_OPCODE_INDEX { Text = "INDEX" ; }; String SC_OPCODE_AREAS { Text = "AREAS" ; }; |