diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-03 14:55:26 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-20 10:13:22 +0000 |
| commit | dd9084729d4a9c50e5bad02be7e3897d2b893852 (patch) | |
| tree | 9df6212e0bb7020b0af9947d0e8c77b7916267f6 /accessibility | |
| parent | 6a4620ec244b41b32fe339af303e1c72c49c681d (diff) | |
Related: tdf#82998 rearrange, no logic change
Change-Id: I1d3a6a552bd535622009b43e0633a357b1a919e6
(cherry picked from commit da907c7b7a328d29d5ede8d43f539811856417f9)
Reviewed-on: https://gerrit.libreoffice.org/15388
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'accessibility')
| -rw-r--r-- | accessibility/source/standard/vclxaccessiblelist.cxx | 75 |
1 files changed, 41 insertions, 34 deletions
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index f5b103433db9..5311dd14e243 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -258,56 +258,63 @@ void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool b_IsDropDownList) } } } - if (m_aBoxType == COMBOBOX && b_IsDropDownList) + + if (m_aBoxType == COMBOBOX) { - //VCLXAccessibleDropDownComboBox - //when in list is dropped down, xText = NULL - if (m_pListBoxHelper && m_pListBoxHelper->IsInDropDown()) + if (b_IsDropDownList) { - if ( aNewValue.hasValue() || aOldValue.hasValue() ) + //VCLXAccessibleDropDownComboBox + //when in list is dropped down, xText = NULL + if (m_pListBoxHelper && m_pListBoxHelper->IsInDropDown()) { - NotifyAccessibleEvent( - AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, - aOldValue, - aNewValue ); + if ( aNewValue.hasValue() || aOldValue.hasValue() ) + { + NotifyAccessibleEvent( + AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, + aOldValue, + aNewValue ); - NotifyListItem(aNewValue); + NotifyListItem(aNewValue); + } } } + else + { + //VCLXAccessibleComboBox + NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, uno::Any(), uno::Any() ); + } } - else if (m_aBoxType == COMBOBOX && !b_IsDropDownList) - { - //VCLXAccessibleComboBox - NotifyAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, uno::Any(), uno::Any() ); - } - else if (m_aBoxType == LISTBOX && b_IsDropDownList) + else if (m_aBoxType == LISTBOX) { - //VCLXAccessibleDropdownListBox - //when in list is dropped down, xText = NULL - if (m_pListBoxHelper && m_pListBoxHelper->IsInDropDown()) + if (b_IsDropDownList) { - if ( aNewValue.hasValue() || aOldValue.hasValue() ) + //VCLXAccessibleDropdownListBox + //when in list is dropped down, xText = NULL + if (m_pListBoxHelper && m_pListBoxHelper->IsInDropDown()) { - NotifyAccessibleEvent( - AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, - aOldValue, - aNewValue ); + if ( aNewValue.hasValue() || aOldValue.hasValue() ) + { + NotifyAccessibleEvent( + AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, + aOldValue, + aNewValue ); - NotifyListItem(aNewValue); + NotifyListItem(aNewValue); + } } } - } - else if (m_aBoxType == LISTBOX && !b_IsDropDownList) - { - if ( aNewValue.hasValue() || aOldValue.hasValue() ) + else { - NotifyAccessibleEvent( - AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, - aOldValue, - aNewValue ); + if ( aNewValue.hasValue() || aOldValue.hasValue() ) + { + NotifyAccessibleEvent( + AccessibleEventId::ACTIVE_DESCENDANT_CHANGED, + aOldValue, + aNewValue ); - NotifyListItem(aNewValue); + NotifyListItem(aNewValue); + } } } } |