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 | 71cab43133e4ec9d890faeb094c3447a060127ba (patch) | |
| tree | 22af211218e88026cf8e3ff14dadb3aed5b0f0b6 /accessibility | |
| parent | fe6937c21130f02eefdae80f51d8478ea309605b (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
Diffstat (limited to 'accessibility')
| -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 ece7855ad266..52db6b4563ab 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 ); } |