1 files changed, 28 insertions, 6 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index dd39a133a450..939af2c7d1be 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -2975,24 +2975,46 @@ void SbiRuntime::StepJUMP( sal_uInt32 nOp1 )
     pCode = reinterpret_cast<const sal_uInt8*>(pImg->GetCode()) + nOp1;
 }
 
+bool SbiRuntime::EvaluateTopOfStackAsBool()
+{
+    SbxVariableRef tos = PopVar();
+    // In a test e.g. If Null then
+        // will evaluate Null will act as if False
+    if ( bVBAEnabled && tos->IsNull() )
+    {
+        return false;
+    }
+    if ( tos->IsObject() )
+    {
+        //GetBool applied to an Object attempts to dereference and evaluate
+            //the underlying value as Bool. Here, we're checking rather that
+            //it is not null
+        return tos->GetObject();
+    }
+    else
+    {
+        return tos->GetBool();
+    }
+}
+
 // evaluate TOS, conditional jump (+target)
 
 void SbiRuntime::StepJUMPT( sal_uInt32 nOp1 )
 {
-    SbxVariableRef p = PopVar();
-    if( p->GetBool() )
+    if ( EvaluateTopOfStackAsBool() )
+    {
         StepJUMP( nOp1 );
+    }
 }
 
 // evaluate TOS, conditional jump (+target)
 
 void SbiRuntime::StepJUMPF( sal_uInt32 nOp1 )
 {
-    SbxVariableRef p = PopVar();
-    // In a test e.g. If Null then
-        // will evaluate Null will act as if False
-    if( ( bVBAEnabled && p->IsNull() ) || !p->GetBool() )
+    if ( !EvaluateTopOfStackAsBool() )
+    {
         StepJUMP( nOp1 );
+    }
 }
 
 // evaluate TOS, jump into JUMP-table (+MaxVal)