diff options
author | Thorsten Behrens <thb@openoffice.org> | 2002-11-29 16:56:25 +0000 |
---|---|---|
committer | Thorsten Behrens <thb@openoffice.org> | 2002-11-29 16:56:25 +0000 |
commit | 65040f64d10c9cccdb6e134c20548ce8996b4531 (patch) | |
tree | 190a8675fe76812e4f944e395392a2c9699f544e /svx/source | |
parent | 6286f9ac44a3f4d32aa19b2e1dffb31d77b39eb7 (diff) |
#105479# Cleaned up unneeded member, removed locking in FireEvent, as that is done by the OInterfaceIteratorHelper internally
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 7d04c218fd9d..30dd0f6a476a 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: AccessibleTextHelper.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.30 $ * - * last change: $Author: thb $ $Date: 2002-10-23 12:09:43 $ + * last change: $Author: thb $ $Date: 2002-11-29 17:56:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -309,12 +309,6 @@ namespace accessibility // whether we (this object) has the focus set (guarded by solar mutex) sal_Bool mbThisHasFocus; - // whether the children are active and editable (guarded by solar mutex) - sal_Bool mbChildrenActive; - - // the internal paragraph number of the child with the focus (guarded by solar mutex) - sal_Int32 mnFocusedChild; - // must be before maStateListeners, has to live longer mutable ::osl::Mutex maMutex; @@ -341,8 +335,6 @@ namespace accessibility mbInNotify( sal_False ), mbGroupHasFocus( sal_False ), mbThisHasFocus( sal_False ), - mbChildrenActive( sal_False ), - mnFocusedChild( -1 ), maOffset(0,0), maStateListeners( maMutex ) { @@ -1242,15 +1234,9 @@ namespace accessibility void AccessibleTextHelper_Impl::FireEvent( const AccessibleEventObject& rEvent ) const { - // -- object locked -- - ::osl::ClearableMutexGuard aGuard( maMutex ); - - ::cppu::OInterfaceIteratorHelper aIter( const_cast< AccessibleTextHelper_Impl* >(this)->maStateListeners ); - // no locking necessary, OInterfaceIteratorHelper copies listeners if someone removes/adds in between // Further locking, actually, might lead to deadlocks, since we're calling out of this object - aGuard.clear(); - // -- until here -- + ::cppu::OInterfaceIteratorHelper aIter( const_cast< AccessibleTextHelper_Impl* >(this)->maStateListeners ); // #102261# Call global queue for focus events if( rEvent.EventId == AccessibleStateType::FOCUSED ) |