diff options
| author | Arnaud Versini <arnaud.versini@gmail.com> | 2018-04-22 16:34:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-22 22:03:15 +0200 |
| commit | 860de7575aa0c3079aac25634677248ac68c1f02 (patch) | |
| tree | b96b70a4c2a847011d2e535b35542c91da90eb67 | |
| parent | fca20f3083c78cc76046e824b062b1ea20d4522b (diff) | |
Reuse getAccessibleRole result if possible
Change-Id: I9566cd6f01a2e21f471d5ce96948ea635729c6f6
Reviewed-on: https://gerrit.libreoffice.org/53288
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 5 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index b97f164292cb..7c12cf570014 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -599,8 +599,9 @@ OUString AccessibleControlShape::CreateAccessibleName() ensureControlModelAccess(); OUString sName; - if ( getAccessibleRole() != AccessibleRole::SHAPE - && getAccessibleRole() != AccessibleRole::RADIO_BUTTON ) + sal_Int16 aAccessibleRole = getAccessibleRole(); + if ( aAccessibleRole != AccessibleRole::SHAPE + && aAccessibleRole != AccessibleRole::RADIO_BUTTON ) { AccessibleControlShape* pCtlAccShape = GetLabeledByControlShape(); if(pCtlAccShape) diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index 015fafabd425..aa86bb0c9606 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -201,12 +201,13 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind break; case VclEventId::WindowActivate: { + sal_Int16 aAccessibleRole = getAccessibleRole(); // avoid notification if a child frame is already active // only one frame may be active at a given time if ( !pAccWindow->HasActiveChildFrame() && - ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || - getAccessibleRole() == accessibility::AccessibleRole::ALERT || - getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) ) // #i18891# + ( aAccessibleRole == accessibility::AccessibleRole::FRAME || + aAccessibleRole == accessibility::AccessibleRole::ALERT || + aAccessibleRole == accessibility::AccessibleRole::DIALOG ) ) // #i18891# { aNewValue <<= accessibility::AccessibleStateType::ACTIVE; NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); @@ -215,9 +216,10 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind break; case VclEventId::WindowDeactivate: { - if ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || - getAccessibleRole() == accessibility::AccessibleRole::ALERT || - getAccessibleRole() == accessibility::AccessibleRole::DIALOG ) // #i18891# + sal_Int16 aAccessibleRole = getAccessibleRole(); + if ( aAccessibleRole == accessibility::AccessibleRole::FRAME || + aAccessibleRole == accessibility::AccessibleRole::ALERT || + aAccessibleRole == accessibility::AccessibleRole::DIALOG ) // #i18891# { aOldValue <<= accessibility::AccessibleStateType::ACTIVE; NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); |