summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basic/source/runtime/step0.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index f067ce43eb..f4fe09a0df 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 );