From 36784563edd5f1107fca072c14eddc69fdf5957f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 14 Mar 2014 14:27:24 +0100 Subject: OAccessibleContextWrapperHelper does not implement XAccessibleContext ...but rather some (non-virtual) base functionality for use in derived classes (that do implement XAccessibleContext) Change-Id: Idb0023906108db22bb9696245f07b9a4c053a0d1 --- comphelper/source/misc/accessiblewrapper.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'comphelper') diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 70164fb0a74a..85a6c60bc16d 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -433,13 +433,13 @@ namespace comphelper IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleContextWrapperHelper, OComponentProxyAggregationHelper, OAccessibleContextWrapperHelper_Base ) - sal_Int32 SAL_CALL OAccessibleContextWrapperHelper::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapperHelper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { // get the child of the wrapped component Reference< XAccessible > xInnerChild = m_xInnerContext->getAccessibleChild( i ); @@ -447,7 +447,7 @@ namespace comphelper } - Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapperHelper::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > OAccessibleContextWrapperHelper::baseGetAccessibleRelationSet( ) throw (RuntimeException, std::exception) { return m_xInnerContext->getAccessibleRelationSet(); // TODO: if this relation set would contain relations to siblings, we would normally need @@ -545,13 +545,13 @@ namespace comphelper sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) throw (RuntimeException, std::exception) { - return OAccessibleContextWrapperHelper::getAccessibleChildCount(); + return baseGetAccessibleChildCount(); } Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { - return OAccessibleContextWrapperHelper::getAccessibleChild( i ); + return baseGetAccessibleChild( i ); } @@ -587,7 +587,7 @@ namespace comphelper Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) { - return OAccessibleContextWrapperHelper::getAccessibleRelationSet(); + return baseGetAccessibleRelationSet(); } -- cgit