diff options
author | Oliver Bolte <obo@openoffice.org> | 2008-07-25 07:58:51 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2008-07-25 07:58:51 +0000 |
commit | 7ec02017ca87e10b3656172eec400d6175b9ec61 (patch) | |
tree | c8aab800d989ec5e1f94805d86d8ae50491a6427 /accessibility/source/standard | |
parent | INTEGRATION: CWS aqua11y02 (1.3.12); FILE MERGED (diff) | |
download | core-7ec02017ca87e10b3656172eec400d6175b9ec61.tar.gz core-7ec02017ca87e10b3656172eec400d6175b9ec61.zip |
INTEGRATION: CWS aqua11y02 (1.4.10); FILE MERGED
2008/06/10 12:58:09 obr 1.4.10.1: #i70872# toolbox items returned a parent XAccessible different from the one returned by the toolbox window
Diffstat (limited to 'accessibility/source/standard')
-rw-r--r-- | accessibility/source/standard/vclxaccessibletoolbox.cxx | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 0abe20e81e50..3e4ecd843d7d 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vclxaccessibletoolbox.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -520,7 +520,7 @@ void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelpe void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { // to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING) - Reference< XAccessible > xTemp = this; + Reference< XAccessibleContext > xTemp = this; switch ( rVclWindowEvent.GetId() ) { @@ -673,15 +673,6 @@ Sequence< ::rtl::OUString > VCLXAccessibleToolBox::getSupportedServiceNames() th return aNames; } // ----------------------------------------------------------------------------- -// XAccessible -// ----------------------------------------------------------------------------- -Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBox::getAccessibleContext( ) throw (RuntimeException) -{ - comphelper::OContextEntryGuard aGuard( this ); - - return this; -} -// ----------------------------------------------------------------------------- // XAccessibleContext // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) throw (RuntimeException) @@ -715,7 +706,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal USHORT nHighlightItemId = pToolBox->GetHighlightItemId(); Window* pItemWindow = pToolBox->GetItemWindow( nItemId ); // not found -> create a new child - VCLXAccessibleToolBoxItem* pChild = new VCLXAccessibleToolBoxItem( pToolBox, i, this ); + VCLXAccessibleToolBoxItem* pChild = new VCLXAccessibleToolBoxItem( pToolBox, i ); Reference< XAccessible> xParent = pChild; if ( pItemWindow ) { |