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

[Caolán McNamara]

 accessibility/source/standard/vclxaccessiblebox.cxx |   16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit 6a4620ec244b41b32fe339af303e1c72c49c681d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 3 14:10:24 2015 +0100

    Related: tdf#82998 don't emit an Indeterminate state change for boxes
    
    Emitting object:state-changed:indeterminate is appropriate for things like
    tri-state checkboxes when the state is neither fully checked nor fully
    unchecked. ... jdiggs think that this event doesn't make sense in this instance
    for any platform's accessibility API
    
    Change-Id: Id8288522a825ad7ff61524ad4f225a79c015bb8f
    (cherry picked from commit ccaeafab704b46ed8ca8c4aad3c14f6143bfc141)
    Reviewed-on: https://gerrit.libreoffice.org/15386
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 295bbe4..c75e8b4 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -113,9 +113,8 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
         case VCLEVENT_DROPDOWN_SELECT:
         case VCLEVENT_LISTBOX_SELECT:
         case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
-
         {
-                // Forward the call to the list child.
+            // Forward the call to the list child.
             VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get());
             if ( pList == NULL )
             {
@@ -125,14 +124,9 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
             if ( pList != NULL )
             {
                 pList->ProcessWindowEvent (rVclWindowEvent, m_bIsDropDownBox);
-                if(m_bIsDropDownBox)
+                if (m_bIsDropDownBox)
                 {
                     NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, Any(), Any());
-                    Any aOldValue;
-                    Any aNewValue;
-                    aOldValue <<= AccessibleStateType::INDETERMINATE;
-                    NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue);
-
                 }
             }
             break;
@@ -187,12 +181,6 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven
                     pList->UpdateSelection_Acc(sText, m_bIsDropDownBox);
                     if (m_bIsDropDownBox || ( !m_bIsDropDownBox && m_aBoxType==COMBOBOX))
                         NotifyAccessibleEvent(AccessibleEventId::VALUE_CHANGED, Any(), Any());
-
-                    Any aOldValue;
-                    Any aNewValue;
-                    aOldValue <<= AccessibleStateType::INDETERMINATE;
-                    NotifyAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue);
-
                 }
             }
             break;