From 62b39a7c48dcd74f5e14ffd78b3ab917a84d7622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 1 Oct 2015 14:03:05 +0100 Subject: [PATCH] coverity#1325255 Unchecked dynamic_cast Change-Id: Ie1a6b231e0313d1c00ffb9ab0137af2beeb05e02 --- basic/source/runtime/runtime.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index fe29acdbd7b6..080aac6a8c24 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -3254,8 +3254,8 @@ bool SbiRuntime::checkClass_Impl( const SbxVariableRef& refVal, { if ( ( bVBAEnabled || CodeCompleteOptions::IsExtendedTypeDeclaration() ) && pObj->IsA( TYPE(SbUnoObject) ) ) { - SbUnoObject* pUnoObj = dynamic_cast( pObj ); - bOk = checkUnoObjectType( pUnoObj, aClass ); + SbUnoObject& rUnoObj = dynamic_cast(*pObj); + bOk = checkUnoObjectType(&rUnoObj, aClass); } else bOk = false; @@ -3723,10 +3723,9 @@ void SbiRuntime::SetupArgs( SbxVariable* p, sal_uInt32 nOp1 ) else if( bVBAEnabled && p->GetType() == SbxOBJECT && (0 == dynamic_cast( p) || !p->IsBroadcaster()) ) { // Check for default method with named parameters - SbxBaseRef pObj = p->GetObject(); - if( pObj && 0 != dynamic_cast( &pObj) ) + SbxBaseRef xObj = p->GetObject(); + if (SbUnoObject* pUnoObj = dynamic_cast(&xObj)) { - SbUnoObject* pUnoObj = static_cast(static_cast(pObj)); Any aAny = pUnoObj->getUnoAny(); if( aAny.getValueType().getTypeClass() == TypeClass_INTERFACE )