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