diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-18 15:11:01 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-04-18 21:46:57 +0200 |
commit | 4f3f61a621a0e66fd0eab4886a3aa51e10513ad3 (patch) | |
tree | 03fa6f0fa067e6d7805cfa95e1c234f7821d4f42 /accessibility/source/standard/vclxaccessiblebutton.cxx | |
parent | 8d4fd3418322f3f6852054c44be2cd74b0db76ee (diff) |
loplugin:flatten in accessibility
Change-Id: I5e02fe0288845210f1d8e41db0342967858098fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92487
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'accessibility/source/standard/vclxaccessiblebutton.cxx')
-rw-r--r-- | accessibility/source/standard/vclxaccessiblebutton.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index b5289d7ed9d8..f0ade105ce27 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -73,25 +73,25 @@ void VCLXAccessibleButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); VclPtr< PushButton > pButton = GetAs< PushButton >(); - if ( pButton ) - { - rStateSet.AddState( AccessibleStateType::FOCUSABLE ); + if ( !pButton ) + return; - if ( pButton->GetState() == TRISTATE_TRUE ) - rStateSet.AddState( AccessibleStateType::CHECKED ); + rStateSet.AddState( AccessibleStateType::FOCUSABLE ); - if ( pButton->IsPressed() ) - rStateSet.AddState( AccessibleStateType::PRESSED ); + if ( pButton->GetState() == TRISTATE_TRUE ) + rStateSet.AddState( AccessibleStateType::CHECKED ); - // IA2 CWS: if the button has a popup menu, it should has the state EXPANDABLE - if( pButton->GetType() == WindowType::MENUBUTTON ) - { - rStateSet.AddState( AccessibleStateType::EXPANDABLE ); - } - if( pButton->GetStyle() & WB_DEFBUTTON ) - { - rStateSet.AddState( AccessibleStateType::DEFAULT ); - } + if ( pButton->IsPressed() ) + rStateSet.AddState( AccessibleStateType::PRESSED ); + + // IA2 CWS: if the button has a popup menu, it should has the state EXPANDABLE + if( pButton->GetType() == WindowType::MENUBUTTON ) + { + rStateSet.AddState( AccessibleStateType::EXPANDABLE ); + } + if( pButton->GetStyle() & WB_DEFBUTTON ) + { + rStateSet.AddState( AccessibleStateType::DEFAULT ); } } |