diff options
| author | Wang Lei <leiw@apache.org> | 2012-10-10 06:08:12 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-11 12:30:10 +0100 |
| commit | 0946de1e2fbf8bd5ad3919429f648359d4464eca (patch) | |
| tree | 5d3fa059defeeb3d3216e0f9e15eecd97917405d /include | |
| parent | 1691607cc44579bc8193db382d96038177acfc64 (diff) | |
Resolves: #i121120 Support RightB(), LeftB(), LenB() and MidB()
Patch by: Zhang Lu
Review by: Wang Lei
(cherry picked from commit 424079cb8348d77e40f7d3291578bdffbe662f34)
Conflicts:
formula/inc/formula/compiler.hrc
formula/inc/formula/opcode.hxx
oox/source/xls/formulabase.cxx
sc/inc/helpids.h
sc/util/hidother.src
sc/util/makefile.mk
Change-Id: Ia04aa69aa2764842507b36ba7cc8c99e99a314e9
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/compiler.hrc | 8 | ||||
| -rw-r--r-- | include/formula/opcode.hxx | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc index 053947c2a796..e6c6ef3d0df3 100644 --- a/include/formula/compiler.hrc +++ b/include/formula/compiler.hrc @@ -403,9 +403,13 @@ #define SC_OPCODE_COUNT_IFS 405 #define SC_OPCODE_SKEWP 406 #define SC_OPCODE_STOP_2_PAR 407 -#define SC_OPCODE_LAST_OPCODE_ID 406 /* last OpCode */ +#define SC_OPCODE_LENB 408 +#define SC_OPCODE_RIGHTB 409 +#define SC_OPCODE_LEFTB 410 +#define SC_OPCODE_MIDB 412 +#define SC_OPCODE_LAST_OPCODE_ID 413 /* last OpCode */ -#define SC_OPCODE_STOP_FUNCTION 407 +#define SC_OPCODE_STOP_FUNCTION 412 /*** Internal ***/ #define SC_OPCODE_INTERNAL_BEGIN 9999 diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index b94c066a624b..47e2cdc2dff4 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -301,6 +301,10 @@ enum OpCodeEnum ocSubstitute = SC_OPCODE_SUBSTITUTE, ocRept = SC_OPCODE_REPT, ocConcat = SC_OPCODE_CONCAT, + ocLenB = SC_OPCODE_LENB, + ocRightB = SC_OPCODE_RIGHTB, + ocLeftB = SC_OPCODE_LEFTB, + ocMidB = SC_OPCODE_MIDB, ocNumberValue = SC_OPCODE_NUMBERVALUE, // Matrix functions ocMatValue = SC_OPCODE_MAT_VALUE, |