Skip to content

C
core
Kaydet (Commit) 014a0e5d authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

coverity#1132660 Dereference after null check 

Change-Id: Ib184d73f2ced3beca8540a37bab74c4a712170ba
üst 989c7ce9
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 16 deletions
accessibility/source/extended/accessiblelistboxentry.cxx
Dosyayı görüntüle @ 014a0e5d
...@@ -427,32 +427,29 @@ namespace accessibility ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment