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

coverity#982443 Explicitt null dereferenced

Browse Source 
Change-Id: I470c34c38eda673e6663b23cdb28ea4be0bef914
Reviewed-on: https://gerrit.libreoffice.org/2218
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Norbert Thiebaud
2013-02-18 02:12:13 -06:00
parent 13ed66c9ce
commit bb82f5c1e9
1 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
basctl/source/basicide/bastype3.cxx
View File

@@ -208,49 +208,45 @@ SbxVariable* TreeListBox::FindVariable( SvTreeListEntry* pEntry )
switch ( pBE->GetType() ) switch ( pBE->GetType() )
{ {
case OBJ_TYPE_LIBRARY: case OBJ_TYPE_LIBRARY:
{ if (BasicManager* pBasMgr = aDocument.getBasicManager())
if (BasicManager* pBasMgr = aDocument.getBasicManager()) pVar = pBasMgr->GetLib( aName );
pVar = pBasMgr->GetLib( aName );
}
break; break;
case OBJ_TYPE_MODULE: case OBJ_TYPE_MODULE:
DBG_ASSERT(dynamic_cast<StarBASIC*>(pVar), "FindVariable: invalid Basic");
if(!pVar)
{ {
DBG_ASSERT(dynamic_cast<StarBASIC*>(pVar), "FindVariable: invalid Basic"); break;
// extract the module name from the string like "Sheet1 (Example1)"
if( bDocumentObjects )
{
sal_uInt16 nIndex = 0;
aName = aName.GetToken( 0, ' ', nIndex );
}
pVar = static_cast<StarBASIC*>(pVar)->FindModule( aName );
} }
// extract the module name from the string like "Sheet1 (Example1)"
if( bDocumentObjects )
{
sal_uInt16 nIndex = 0;
aName = aName.GetToken( 0, ' ', nIndex );
}
pVar = static_cast<StarBASIC*>(pVar)->FindModule( aName );
break; break;
case OBJ_TYPE_METHOD: case OBJ_TYPE_METHOD:
DBG_ASSERT(dynamic_cast<SbxObject*>(pVar), "FindVariable: invalid modul/object");
if(!pVar)
{ {
DBG_ASSERT(dynamic_cast<SbxObject*>(pVar), "FindVariable: invalid modul/object"); break;
pVar = static_cast<SbxObject*>(pVar)->GetMethods()->Find(aName, SbxCLASS_METHOD);
} }
pVar = static_cast<SbxObject*>(pVar)->GetMethods()->Find(aName, SbxCLASS_METHOD);
break; break;
case OBJ_TYPE_DIALOG: case OBJ_TYPE_DIALOG:
{ // sbx dialogs removed
// sbx dialogs removed
}
break; break;
case OBJ_TYPE_DOCUMENT_OBJECTS: case OBJ_TYPE_DOCUMENT_OBJECTS:
bDocumentObjects = true; bDocumentObjects = true;
case OBJ_TYPE_USERFORMS: case OBJ_TYPE_USERFORMS:
case OBJ_TYPE_NORMAL_MODULES: case OBJ_TYPE_NORMAL_MODULES:
case OBJ_TYPE_CLASS_MODULES: case OBJ_TYPE_CLASS_MODULES:
{ // skip, to find the child entry.
// skip, to find the child entry. continue;
continue; default:
} OSL_FAIL( "FindVariable: Unbekannter Typ!" );
default: pVar = 0;
{
OSL_FAIL( "FindVariable: Unbekannter Typ!" );
pVar = 0;
}
break; break;
} }
if ( !pVar ) if ( !pVar )