From 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249 Mon Sep 17 00:00:00 2001 From: Herbert Dürr Date: Mon, 6 Jan 2014 14:10:06 +0000 Subject: 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 --- basic/source/comp/parser.cxx | 2 +- basic/source/comp/token.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'basic/source/comp') 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; -- cgit