summaryrefslogtreecommitdiff
path: root/accessibility
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-12-21 13:29:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-12-21 13:43:06 +0100
commit26f46b861d8504033685b2eec4d003eef8109a27 (patch)
treed35bf900af9e17f0f7e17348c14aef9df74ef579 /accessibility
parentca28826a087245686d7fca3ffc8ca1f03307924d (diff)
loplugin:flatten in accessibility..basic
Change-Id: If2cc282c2b135d634daf393a082c29049b10a677 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127223 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility')
-rw-r--r--accessibility/source/extended/accessiblelistboxentry.cxx39
1 files changed, 19 insertions, 20 deletions
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx
index 716955b69595..be1d98650324 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -409,30 +409,29 @@ namespace accessibility
::osl::MutexGuard aGuard( m_aMutex );
SvTreeListBox* pBox = m_pTreeListBox;
- if(pBox)
+ if(!pBox)
+ return AccessibleRole::UNKNOWN;
+
+ SvTreeFlags treeFlag = pBox->GetTreeFlags();
+ if(treeFlag & SvTreeFlags::CHKBTN )
{
- SvTreeFlags treeFlag = pBox->GetTreeFlags();
- if(treeFlag & SvTreeFlags::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 SvButtonState::Checked:
- case SvButtonState::Unchecked:
- return AccessibleRole::CHECK_BOX;
- case SvButtonState::Tristate:
- default:
- return AccessibleRole::LABEL;
- }
+ case SvButtonState::Checked:
+ case SvButtonState::Unchecked:
+ return AccessibleRole::CHECK_BOX;
+ case SvButtonState::Tristate:
+ default:
+ return AccessibleRole::LABEL;
}
- if (GetRoleType() == 0)
- return AccessibleRole::LIST_ITEM;
- else
- //o is: return AccessibleRole::LABEL;
- return AccessibleRole::TREE_ITEM;
}
- 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( )