diff options
author | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
---|---|---|
committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:51:50 +0100 |
commit | 6db6a43ddc5a66f41f109b7995fd83adb5d35411 (patch) | |
tree | be01c36438a39fdebd43608355671d2e6d120108 /basic/source/inc/token.hxx | |
parent | 20658054d8bd6380b4b175b552ccc1480c49d01c (diff) | |
parent | d1a9ad8f4dc25817cea279262286cdfb421fe891 (diff) |
Merge branch 'vba' fix conflics, trailing ws & tab issues
also removed some old headers ( which I need to add new ones for )
Conflicts:
basic/source/classes/sbunoobj.cxx
basic/source/classes/sbxmod.cxx
xmloff/inc/xmlnmspe.hxx
xmloff/inc/xmloff/xmltoken.hxx
xmlscript/inc/xmlscript/xmldlg_imexp.hxx
Diffstat (limited to 'basic/source/inc/token.hxx')
-rw-r--r-- | basic/source/inc/token.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx index ec07dcbd8518..531bafae04bc 100644 --- a/basic/source/inc/token.hxx +++ b/basic/source/inc/token.hxx @@ -70,7 +70,7 @@ enum SbiToken { IF, _IN_, INPUT, LET, LINE, LINEINPUT, LOCAL, LOOP, LPRINT, LSET, NAME, NEW, NEXT, - ON, OPEN, OPTION, IMPLEMENTS, + ON, OPEN, OPTION, ATTRIBUTE, IMPLEMENTS, PRINT, PRIVATE, PROPERTY, PUBLIC, REDIM, REM, RESUME, RETURN, RSET, SELECT, SET, SHARED, STATIC, STEP, STOP, SUB, |