diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 13:14:47 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-01-28 13:14:47 +0000 |
| commit | ef78b2f8676ff84299a7821d86ce2ae9c5847060 (patch) | |
| tree | 3ec3c6e2bc2879617760d256c27aa764f1e73750 | |
| parent | 93326c80b847bfc15240da8f562380a8835bb7ca (diff) | |
INTEGRATION: CWS tbe32 (1.2.16); FILE MERGED
2007/11/30 12:08:04 tbe 1.2.16.1: #i34062# state change events for SHOWING not reliably sent for menus
| -rw-r--r-- | accessibility/source/standard/accessiblemenucomponent.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 912a61345..8b9391389 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -4,9 +4,9 @@ * * $RCSfile: accessiblemenucomponent.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2007-06-27 15:36:19 $ + * last change: $Author: vg $ $Date: 2008-01-28 14:14:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -116,14 +116,14 @@ sal_Bool OAccessibleMenuComponent::IsEnabled() // ----------------------------------------------------------------------------- -sal_Bool OAccessibleMenuComponent::IsShowing() +sal_Bool OAccessibleMenuComponent::IsVisible() { - sal_Bool bShowing = sal_False; + sal_Bool bVisible = sal_False; if ( m_pMenu ) - bShowing = m_pMenu->IsMenuVisible(); + bVisible = m_pMenu->IsMenuVisible(); - return bShowing; + return bVisible; } // ----------------------------------------------------------------------------- @@ -141,10 +141,11 @@ void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHe if ( IsFocused() ) rStateSet.AddState( AccessibleStateType::FOCUSED ); - rStateSet.AddState( AccessibleStateType::VISIBLE ); - - if ( IsShowing() ) + if ( IsVisible() ) + { + rStateSet.AddState( AccessibleStateType::VISIBLE ); rStateSet.AddState( AccessibleStateType::SHOWING ); + } rStateSet.AddState( AccessibleStateType::OPAQUE ); } |