diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-02 09:03:31 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-02 09:03:31 +0000 |
| commit | 3b50ad9a54fd4d01a2a0db210c647a612cb9e1f5 (patch) | |
| tree | 718aad9b51f9c39db1e4766c362f6d34d3428ae7 | |
| parent | 7848d3706f8e39aaec0a96da2f26a4b44a3a4178 (diff) | |
INTEGRATION: CWS npower10 (1.29.40); FILE MERGED
2008/05/07 07:10:56 pflin 1.29.40.2: RESYNC: (1.29-1.30); FILE MERGED
2007/12/20 21:21:52 npower 1.29.40.1: #84803
| -rw-r--r-- | basic/source/runtime/step0.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx index dbcbb5cb530f..6ef6db23798c 100644 --- a/basic/source/runtime/step0.cxx +++ b/basic/source/runtime/step0.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: step0.cxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.32 $ * * This file is part of OpenOffice.org. * @@ -313,8 +313,10 @@ void SbiRuntime::StepIS() SbxVariableRef refVar2 = PopVar(); BOOL bRes = BOOL( refVar1->GetType() == SbxOBJECT - && refVar2->GetType() == SbxOBJECT - && refVar1->GetObject() == refVar2->GetObject() ); + && refVar2->GetType() == SbxOBJECT ); + if ( bVBAEnabled && !bRes ) + Error( SbERR_INVALID_USAGE_OBJECT ); + bRes = ( bRes && refVar1->GetObject() == refVar2->GetObject() ); SbxVariable* pRes = new SbxVariable; pRes->PutBool( bRes ); PushVar( pRes ); |