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);
+            }
         }
     }
 }