diff options
| author | Herbert Dürr <hdu@apache.org> | 2014-01-06 14:10:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-06 16:32:20 +0000 |
| commit | 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249 (patch) | |
| tree | 41843d922d70b433a0e5647b0fdcdb406fa6be0e /basic/source | |
| parent | 01329972d89ddfd30d197b7947c571fdb83b0cf8 (diff) | |
Resolves: #i123817# prepare codebase for updating to boost 1.55
(cherry picked from commit c31988351c10e9f3fd783730d95da34efd52c153)
Conflicts:
basic/source/comp/parser.cxx
basic/source/comp/token.cxx
dbaccess/source/ui/dlg/generalpage.cxx
sc/source/ui/unoobj/chart2uno.cxx
vcl/quartz/salbmp.cxx
Change-Id: Ic9580f2d4a44959cb3e38906eb4153b2c2a54899
Diffstat (limited to 'basic/source')
| -rw-r--r-- | basic/source/comp/parser.cxx | 2 | ||||
| -rw-r--r-- | basic/source/comp/token.cxx | 4 | ||||
| -rw-r--r-- | basic/source/inc/token.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index da4420b4fe01..a132e8988946 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -758,7 +758,7 @@ void SbiParser::Option() { switch( Next() ) { - case EXPLICIT: + case BASIC_EXPLICIT: bExplicit = true; break; case BASE: if( Next() == NUMBER ) diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index bc0519dfeb00..d283f2e5ddd7 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -96,7 +96,7 @@ static const TokenTable aTokTable_Basic [] = { { ERASE, "Erase" }, { _ERROR_, "Error" }, { EXIT, "Exit" }, - { EXPLICIT, "Explicit" }, + { BASIC_EXPLICIT, "Explicit" }, { FOR, "For" }, { FUNCTION, "Function" }, { GET, "Get" }, @@ -192,7 +192,7 @@ TokenLabelInfo::TokenLabelInfo( void ) } // Token accepted as label by VBA SbiToken eLabelToken[] = { ACCESS, ALIAS, APPEND, BASE, BINARY, CLASSMODULE, - COMPARE, COMPATIBLE, DEFERR, _ERROR_, EXPLICIT, LIB, LINE, LPRINT, NAME, + COMPARE, COMPATIBLE, DEFERR, _ERROR_, BASIC_EXPLICIT, LIB, LINE, LPRINT, NAME, TOBJECT, OUTPUT, PROPERTY, RANDOM, READ, STEP, STOP, TEXT, VBASUPPORT, NIL }; SbiToken* pTok = eLabelToken; SbiToken eTok; diff --git a/basic/source/inc/token.hxx b/basic/source/inc/token.hxx index cb40559ea763..0b6482ac98ff 100644 --- a/basic/source/inc/token.hxx +++ b/basic/source/inc/token.hxx @@ -89,7 +89,7 @@ enum SbiToken { NUMBER=FIRSTEXTRA, FIXSTRING, SYMBOL, _CDECL_, BYVAL, BYREF, OUTPUT, RANDOM, APPEND, BINARY, ACCESS, LOCK, READ, PRESERVE, BASE, ANY, LIB, _OPTIONAL_, - EXPLICIT, COMPATIBLE, CLASSMODULE, PARAMARRAY, WITHEVENTS, + BASIC_EXPLICIT, COMPATIBLE, CLASSMODULE, PARAMARRAY, WITHEVENTS, // from here there are JavaScript-tokens (same enum so that same type) FIRSTJAVA, |