accessibility/source/extended/accessibleeditbrowseboxcell.cxx | 6 ++---
comphelper/source/misc/accessiblewrapper.cxx | 12 +++++-----
include/comphelper/accessiblewrapper.hxx | 6 ++---
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 36784563edd5f1107fca072c14eddc69fdf5957f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Mar 14 14:27:24 2014 +0100
OAccessibleContextWrapperHelper does not implement XAccessibleContext
...but rather some (non-virtual) base functionality for use in derived
classes
(that do implement XAccessibleContext)
Change-Id: Idb0023906108db22bb9696245f07b9a4c053a0d1
diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
index a595792..d5c3878 100644
--- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
+++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx
@@ -110,7 +110,7 @@ namespace accessibility
Reference< XAccessibleRelationSet > SAL_CALL
EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException,
std::exception )
{
SolarMethodGuard aGuard( *this );
- return OAccessibleContextWrapperHelper::getAccessibleRelationSet( );
+ return baseGetAccessibleRelationSet( );
}
Reference<XAccessibleStateSet > SAL_CALL
EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException,
std::exception )
@@ -123,13 +123,13 @@ namespace accessibility
sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount( )
throw (RuntimeException, std::exception)
{
SolarMethodGuard aGuard( *this );
- return OAccessibleContextWrapperHelper::getAccessibleChildCount();
+ return baseGetAccessibleChildCount();
}
Reference< XAccessible > SAL_CALL
EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw
(::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException,
std::exception)
{
SolarMethodGuard aGuard( *this );
- return OAccessibleContextWrapperHelper::getAccessibleChild( i );
+ return baseGetAccessibleChild( i );
}
sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() throw (
RuntimeException, std::exception )
diff --git a/comphelper/source/misc/accessiblewrapper.cxx
b/comphelper/source/misc/accessiblewrapper.cxx
index 70164fb..85a6c60 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();
}
diff --git a/include/comphelper/accessiblewrapper.hxx
b/include/comphelper/accessiblewrapper.hxx
index 5c5fa41..a6504c8 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -201,9 +201,9 @@ namespace comphelper
DECLARE_XTYPEPROVIDER( )
// XAccessibleContext
- virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw
(::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild(
sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException, std::exception);
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL
getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException,
std::exception);
+ sal_Int32 baseGetAccessibleChildCount( ) throw
(::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible > baseGetAccessibleChild(
sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException, std::exception);
+ ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleRelationSet >
baseGetAccessibleRelationSet( ) throw
(::com::sun::star::uno::RuntimeException, std::exception);
// XAccessibleEventListener
virtual void SAL_CALL notifyEvent( const
::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw
(::com::sun::star::uno::RuntimeException, std::exception);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
