diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 10:26:40 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-04 10:26:40 +0000 |
| commit | 8e6d0c1b27adfd5a218171f8d1ad41cfcac34f18 (patch) | |
| tree | 26df20a489811725abcd54e4c339a30831b3bc19 /comphelper | |
| parent | a76f5b306778dfe71f049257e69c672b182b3efd (diff) | |
INTEGRATION: CWS tbe9 (1.7.52); FILE MERGED
2003/11/19 12:03:26 tbe 1.7.52.1: #111089# return the proxy XAccessible instead of the inner XAccessible
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/accessiblewrapper.cxx | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 0eb67db70389..b5b1bde2e38c 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: accessiblewrapper.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2003-05-19 12:57:23 $ + * last change: $Author: hr $ $Date: 2004-02-04 11:26:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -359,7 +359,18 @@ namespace comphelper //-------------------------------------------------------------------- IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleWrapper, OComponentProxyAggregation, OAccessibleWrapper_Base ) - IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleWrapper, OComponentProxyAggregation, OAccessibleWrapper_Base ) + IMPLEMENT_FORWARD_REFCOUNT( OAccessibleWrapper, OComponentProxyAggregation ) + + //-------------------------------------------------------------------- + Any OAccessibleWrapper::queryInterface( const Type& _rType ) throw (RuntimeException) + { + // #111089# instead of the inner XAccessible the proxy XAccessible must be returned + Any aReturn = OAccessibleWrapper_Base::queryInterface( _rType ); + if ( !aReturn.hasValue() ) + aReturn = OComponentProxyAggregation::queryInterface( _rType ); + + return aReturn; + } //-------------------------------------------------------------------- Reference< XAccessibleContext > OAccessibleWrapper::getContextNoCreate( ) const |