diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-08-30 09:00:07 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-08-30 09:00:07 +0000 |
commit | 69ba0d06525ec7d7706b7c4a3aa107d26485c535 (patch) | |
tree | 9958842362689136094c8d140330acfd7e0926a8 | |
parent | 0e5064562e488e1a277a0d84fbd5595fe0019f76 (diff) |
INTEGRATION: CWS npower7 (1.19.42); FILE MERGED
2007/05/02 09:45:21 npower 1.19.42.2: #i#68898#
2007/02/27 18:29:09 npower 1.19.42.1: #i68897 constant and dim as xxx support
-rw-r--r-- | basic/source/comp/parser.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 233dd9eabbac..c3ab8341686c 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -4,9 +4,9 @@ * * $RCSfile: parser.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hr $ $Date: 2007-06-27 14:20:42 $ + * last change: $Author: vg $ $Date: 2007-08-30 10:00:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -152,7 +152,6 @@ SbiParser::SbiParser( StarBASIC* pb, SbModule* pm ) bSingleLineIf = bExplicit = FALSE; bClassModule = FALSE; - bVBASupportOn = FALSE; pPool = &aPublics; for( short i = 0; i < 26; i++ ) eDefTypes[ i ] = SbxVARIANT; // Kein expliziter Defaulttyp @@ -609,7 +608,12 @@ void SbiParser::Set() // ( its necessary for vba objects where set is object // specific and also doesn't involve processing default params ) if( pDef->GetTypeId() ) - aGen.Gen( _SETCLASS, pDef->GetTypeId() ); + { + if ( bVBASupportOn ) + aGen.Gen( _VBASETCLASS, pDef->GetTypeId() ); + else + aGen.Gen( _SETCLASS, pDef->GetTypeId() ); + } else { if ( bVBASupportOn ) |