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

[Stephan Bergmann]

 accessibility/source/standard/vclxaccessibletoolboxitem.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 994a3596498305a3a53f21c7f53ed91f78ae834a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 26 22:36:49 2014 +0100

    Revert "Let's use RADIO_BUTTON and CHECK_BUTTON roles"
    
    This reverts commit 97d4f7e07462cbc33e8ebf0bc2bbf8a17c232d50, which appears to
    be incomplete: CHECK_BUTTON is not defined anywhere.

diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
index a2aa191..97b2ea1 100644
--- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
+++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
@@ -88,14 +88,12 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In
                  (( nBits & TIB_DROPDOWNONLY ) == TIB_DROPDOWNONLY)
                )
                 m_nRole = AccessibleRole::BUTTON_DROPDOWN;
-            else if (( nBits & TIB_CHECKABLE ) == TIB_CHECKABLE )
-                m_nRole = AccessibleRole::CHECK_BUTTON;
-            else if
-                (
+            else if (
+                ( ( nBits & TIB_CHECKABLE ) == TIB_CHECKABLE ) ||
                 ( ( nBits & TIB_RADIOCHECK ) == TIB_RADIOCHECK ) ||
                 ( ( nBits & TIB_AUTOCHECK ) == TIB_AUTOCHECK )
-                )
-                m_nRole = AccessibleRole::RADIO_BUTTON;
+               )
+                m_nRole = AccessibleRole::TOGGLE_BUTTON;
             else if ( m_pToolBox->GetItemWindow( m_nItemId ) )
                 m_nRole = AccessibleRole::PANEL;
             break;