[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - accessibility/source

[Caolán McNamara]

 accessibility/source/standard/vclxaccessiblelist.cxx |   75 ++++++++++---------
 1 file changed, 41 insertions(+), 34 deletions(-)

New commits:
commit dd9084729d4a9c50e5bad02be7e3897d2b893852
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 3 14:55:26 2015 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index f5b1034..5311dd1 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);
+            }
         }
     }
 }