[Libreoffice-commits] core.git: accessibility/source

[Niklas Johansson]

 accessibility/source/standard/vclxaccessiblebox.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3258c4f7b79ceedace3b4bdc88a818b45c7593ca
Author: Niklas Johansson <sleeping.pillow at gmail.com>
Date:   Thu Jun 19 22:44:29 2014 +0200

    Dropdown combo-/listboxes should support accessible action togglePopup
    
    At least VoiceOver needs it to be able to open the dropdown in a native
    way (through AXShowMenu). The list still isn't accessible on mac but
    that is an other issue.
    
    Change-Id: I825b54536dfc9743b722eb55873bde3d5eef953d
    Reviewed-on: https://gerrit.libreoffice.org/9833
    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 a1281db..d754875 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -461,11 +461,11 @@ OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 n
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     if (nIndex<0 || nIndex>=getAccessibleActionCount())
         throw ::com::sun::star::lang::IndexOutOfBoundsException();
-    //Solution:When combo_box,it should not has action information.
-    //return TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
-    if (m_aBoxType == LISTBOX)
-        return ::rtl::OUString();
-    return m_bIsDropDownBox?::rtl::OUString():TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
+
+    if (m_bIsDropDownBox)
+        TK_RES_STRING( RID_STR_ACC_ACTION_TOGGLEPOPUP);
+    else
+        ::rtl::OUString();
 }
 
 Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex )