diff options
| author | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-09-20 17:08:08 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-09-20 17:12:46 -0400 |
| commit | 665d1011950dc41d9a7f8e95596d5e1d5d99ff63 (patch) | |
| tree | bf96341b70d2e928d6a8062a52eac03945c9479f /formula | |
| parent | 7dff26aa099aa97c7bfc03806ba8160a9d7e945c (diff) | |
Get DB range import from xlsx to work once again.
We need to map Excel's database ranges (or in Excel's terminology
"tables") to named db ranges because they may be referenced in formula
expressions. Also, Excel tables are always of the form Table*[] when
used in formulas. Skip the "[]" part then the preceding token is a
valid database range.
Diffstat (limited to 'formula')
| -rwxr-xr-x | formula/inc/formula/compiler.hrc | 1 | ||||
| -rw-r--r-- | formula/inc/formula/opcode.hxx | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc index 49252ce85d2b..15d8aab91e3c 100755 --- a/formula/inc/formula/compiler.hrc +++ b/formula/inc/formula/compiler.hrc @@ -57,6 +57,7 @@ #define SC_OPCODE_ARRAY_ROW_SEP 23 #define SC_OPCODE_ARRAY_COL_SEP 24 /* some convs use sep != col_sep */ #define SC_OPCODE_STOP_DIV 25 +#define SC_OPCODE_SKIP 26 /* used to skip raw tokens during string compilation */ /*** error constants #... ***/ #define SC_OPCODE_START_ERRORS 30 diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx index e562c27639c8..b1e585cd8548 100644 --- a/formula/inc/formula/opcode.hxx +++ b/formula/inc/formula/opcode.hxx @@ -58,6 +58,7 @@ enum OpCodeEnum ocStringXML = SC_OPCODE_STRINGXML, ocSpaces = SC_OPCODE_SPACES, ocMatRef = SC_OPCODE_MAT_REF, + ocSkip = SC_OPCODE_SKIP, // Access commands ocDBArea = SC_OPCODE_DB_AREA, ocMacro = SC_OPCODE_MACRO, |