mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS npower7 (1.27.42); FILE MERGED

Browse Source 
2007/07/05 11:44:54 npower 1.27.42.6: RESYNC: (1.29-1.30); FILE MERGED
2007/05/02 09:44:56 npower 1.27.42.5: #i#68898#,#i76819#
2007/04/30 16:18:23 npower 1.27.42.4: RESYNC: (1.27-1.29); FILE MERGED
2007/04/30 11:55:20 npower 1.27.42.3: cleanup
2007/02/27 18:29:10 npower 1.27.42.2: #i68897 constant and dim as xxx support
2007/02/19 10:28:53 npower 1.27.42.1: use a internal flag for vba mode
This commit is contained in:
Vladimir Glazounov
2007-08-30 09:09:56 +00:00
parent ce16a47856
commit a86aef2864
1 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
basic/source/runtime/step2.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: step2.cxx,v $
*
* $Revision: 1.31 $
* $Revision: 1.32 $
*
* last change: $Author: hr $ $Date: 2007-08-03 09:56:23 $
* last change: $Author: vg $ $Date: 2007-08-30 10:09:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -59,6 +59,8 @@ using namespace com::sun::star::script;
using com::sun::star::uno::Reference;
SbxVariable* getVBAConstant( const String& rName );
const static String aThisComponent( RTL_CONSTASCII_USTRINGPARAM("ThisComponent") );
const static String aVBAHook( RTL_CONSTASCII_USTRINGPARAM( "VBAGlobals" ) );
// i#i68894#
@@ -136,6 +138,23 @@ SbxVariable* SbiRuntime::FindElement
BOOL bFatalError = FALSE;
SbxDataType t = (SbxDataType) nOp2;
String aName( pImg->GetString( static_cast<short>( nOp1 & 0x7FFF ) ) );
// Hacky capture of Evaluate [] syntax
// this should be tackled I feel at the pcode level
if ( bIsVBAInterOp && aName.Search('[') == 0 )
{
// emulate pcode here
StepARGC();
// psuedo StepLOADSC
String sArg = aName.Copy( 1, aName.Len() - 2 );
SbxVariable* p = new SbxVariable;
p->PutString( sArg );
PushVar( p );
//
StepARGV();
nOp1 = nOp1 | 0x8000; // indicate params are present
aName = String::CreateFromAscii("Evaluate");
}
if( bLocal )
pElem = refLocals->Find( aName, SbxCLASS_DONTCARE );
if( !pElem )
@@ -166,25 +185,24 @@ SbxVariable* SbiRuntime::FindElement
// i#i68894# if VBAInterOp favour searching vba globals
// over searching for uno classess
if ( bIsVBAInterOp )
if ( bVBAEnabled )
{
// Try Find in VBA symbols space
pElem = VBAFind( aName, SbxCLASS_DONTCARE );
if ( pElem )
bSetName = false; // don't overwrite uno name
else
pElem = getVBAConstant( aName );
}
else
// #72382 VORSICHT! Liefert jetzt wegen unbekannten
// Modulen IMMER ein Ergebnis!
SbxVariable* pUnoClass = findUnoClass( aName );
if( pUnoClass )
{
// #72382 VORSICHT! Liefert jetzt wegen unbekannten
// Modulen IMMER ein Ergebnis!
SbxVariable* pUnoClass = findUnoClass( aName );
if( pUnoClass )
{
pElem = new SbxVariable( t );
SbxValues aRes( SbxOBJECT );
aRes.pObj = pUnoClass;
pElem->SbxVariable::Put( aRes );
}
pElem = new SbxVariable( t );
SbxValues aRes( SbxOBJECT );
aRes.pObj = pUnoClass;
pElem->SbxVariable::Put( aRes );
}
// #62939 Wenn eine Uno-Klasse gefunden wurde, muss
@@ -533,7 +551,7 @@ SbxVariable* SbiRuntime::CheckArray( SbxVariable* pElem )
{
Reference< XInterface > x = *(Reference< XInterface >*)aAny.getValue();
Reference< XIndexAccess > xIndexAccess( x, UNO_QUERY );
if ( !SbiRuntime::isVBAEnabled() )
if ( !bVBAEnabled )
{
// Haben wir Index-Access?
if( xIndexAccess.is() )
@@ -1131,6 +1149,14 @@ void SbiRuntime::StepPUBLIC( UINT32 nOp1, UINT32 nOp2 )
StepPUBLIC_Impl( nOp1, nOp2, false );
}
void SbiRuntime::StepPUBLIC_P( UINT32 nOp1, UINT32 nOp2 )
{
// Creates module variable that isn't reinitialised when
// between invocations ( for VBASupport & document basic only )
if( pMod->pImage->bFirstInit )
StepPUBLIC( nOp1, nOp2 );
}
// Einrichten einer globalen Variablen (+StringID+Typ)
void SbiRuntime::StepGLOBAL( UINT32 nOp1, UINT32 nOp2 )