From efc88d3b58b93811ccd3324658fe0311ec9979e0 Mon Sep 17 00:00:00 2001 From: Ocke Janssen Date: Tue, 30 Jul 2002 05:11:34 +0000 Subject: [PATCH] #101315# insert new ctor with IMutex --- .../comphelper/accessibleselectionhelper.hxx | 10 +++++-- .../source/misc/accessibleselectionhelper.cxx | 26 ++++++++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/comphelper/inc/comphelper/accessibleselectionhelper.hxx index c046af6378ac..1ed2f14933ae 100644 --- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx +++ b/comphelper/inc/comphelper/accessibleselectionhelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: accessibleselectionhelper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: ka $ $Date: 2002-05-06 09:58:52 $ + * last change: $Author: oj $ $Date: 2002-07-30 06:10:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -146,6 +146,9 @@ namespace comphelper OAccessibleSelectionHelper( ); + /// see the respective base class ctor for an extensive comment on this, please + OAccessibleSelectionHelper( IMutex* _pExternalLock ); + // return ourself here by default virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::accessibility::XAccessibleContext > implGetAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); @@ -174,4 +177,7 @@ namespace comphelper /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.1 2002/05/06 09:58:52 ka + * #95585#: added AccessibleSelection helper + * ************************************************************************/ diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index 7c10a80459dc..766c065c9e48 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accessibleselectionhelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: ka $ $Date: 2002-05-06 09:59:53 $ + * last change: $Author: oj $ $Date: 2002-07-30 06:11:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -155,6 +155,11 @@ namespace comphelper { } + //-------------------------------------------------------------------- + OAccessibleSelectionHelper::OAccessibleSelectionHelper( IMutex* _pExternalLock ) : OAccessibleComponentHelper(_pExternalLock) + { + } + //-------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleSelectionHelper, OAccessibleComponentHelper, OAccessibleSelectionHelper_Base ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleSelectionHelper, OAccessibleComponentHelper, OAccessibleSelectionHelper_Base ) @@ -169,49 +174,49 @@ namespace comphelper //-------------------------------------------------------------------- void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - OContextEntryGuard aGuard( this ); + OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAccessibleChild( nChildIndex ); } //-------------------------------------------------------------------- sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - OContextEntryGuard aGuard( this ); + OExternalLockGuard aGuard( this ); return( OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ) ); } //-------------------------------------------------------------------- void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection( ) throw (RuntimeException) { - OContextEntryGuard aGuard( this ); + OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::clearAccessibleSelection(); } //-------------------------------------------------------------------- void SAL_CALL OAccessibleSelectionHelper::selectAllAccessible( ) throw (RuntimeException) { - OContextEntryGuard aGuard( this ); + OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAllAccessible(); } //-------------------------------------------------------------------- sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) throw (RuntimeException) { - OContextEntryGuard aGuard( this ); + OExternalLockGuard aGuard( this ); return( OCommonAccessibleSelection::getSelectedAccessibleChildCount() ); } //-------------------------------------------------------------------- Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - OContextEntryGuard aGuard( this ); + OExternalLockGuard aGuard( this ); return( OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ) ); } //-------------------------------------------------------------------- void SAL_CALL OAccessibleSelectionHelper::deselectSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - OContextEntryGuard aGuard( this ); + OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::deselectSelectedAccessibleChild( nSelectedChildIndex ); } @@ -222,4 +227,7 @@ namespace comphelper /************************************************************************* * history: * $Log: not supported by cvs2svn $ + * Revision 1.1 2002/05/06 09:59:53 ka + * #95585#: added AccessibleSelection helper + * ************************************************************************/