If the button has a poppup menu,it should has the state EXPANDABLE

1 files changed, 12 insertions, 0 deletions

diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 11e7f5497da9..7f287a9964ae 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -104,10 +104,22 @@ void VCLXAccessibleButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper
         rStateSet.AddState( AccessibleStateType::FOCUSABLE );
 
         if ( pButton->GetState() == STATE_CHECK )
+        {
             rStateSet.AddState( AccessibleStateType::CHECKED );
+        }
 
         if ( pButton->IsPressed() )
+        {
             rStateSet.AddState( AccessibleStateType::PRESSED );
+        }
+        if( pButton->GetType() == WINDOW_MENUBUTTON )
+        {
+               rStateSet.AddState( AccessibleStateType::EXPANDABLE );
+        }
+        if( pButton->GetStyle() & WB_DEFBUTTON )
+        {
+            rStateSet.AddState( AccessibleStateType::DEFAULT );
+        }
     }
 }