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

coverity#1132660 Dereference after null check

Browse Source 
Change-Id: Ib184d73f2ced3beca8540a37bab74c4a712170ba
This commit is contained in:
Norbert Thiebaud
2014-01-19 14:59:29 -06:00
parent 989c7ce9a8
commit 014a0e5d6f
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
accessibility/source/extended/accessiblelistboxentry.cxx
View File

@@ -427,32 +427,29 @@ namespace accessibility
return AccessibleRole::TREE_ITEM; return AccessibleRole::TREE_ITEM;
else if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_LIST) else if( nType == TREEBOX_ALLITEM_ACCROLE_TYPE_LIST)
return AccessibleRole::LIST_ITEM; return AccessibleRole::LIST_ITEM;
}
sal_uInt16 treeFlag = pBox->GetTreeFlags(); sal_uInt16 treeFlag = pBox->GetTreeFlags();
if(treeFlag & TREEFLAG_CHKBTN ) if(treeFlag & TREEFLAG_CHKBTN )
{
SvTreeListEntry* pEntry = pBox->GetEntryFromPath( m_aEntryPath );
SvButtonState eState = pBox->GetCheckButtonState( pEntry );
switch( eState )
{ {
SvTreeListEntry* pEntry = pBox->GetEntryFromPath( m_aEntryPath );
SvButtonState eState = pBox->GetCheckButtonState( pEntry );
switch( eState )
{
case SV_BUTTON_CHECKED: case SV_BUTTON_CHECKED:
case SV_BUTTON_UNCHECKED: case SV_BUTTON_UNCHECKED:
return AccessibleRole::CHECK_BOX; return AccessibleRole::CHECK_BOX;
case SV_BUTTON_TRISTATE: case SV_BUTTON_TRISTATE:
default: default:
return AccessibleRole::LABEL; return AccessibleRole::LABEL;
}
} }
if(getRoleType() == 0)
return AccessibleRole::LIST_ITEM;
else
//o is: return AccessibleRole::LABEL;
return AccessibleRole::TREE_ITEM;
} }
else return AccessibleRole::UNKNOWN;
{
if(getRoleType() == 0)
return AccessibleRole::LIST_ITEM;
else
//o is: return AccessibleRole::LABEL;
return AccessibleRole::TREE_ITEM;
}
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) throw (RuntimeException) OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) throw (RuntimeException)