diff options
| -rw-r--r-- | editeng/source/accessibility/AccessibleContextBase.cxx | 15 | ||||
| -rw-r--r-- | include/editeng/AccessibleContextBase.hxx | 6 | ||||
| -rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 6 |
3 files changed, 5 insertions, 22 deletions
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx index f93e4437bab5..32912aa91cf1 100644 --- a/editeng/source/accessibility/AccessibleContextBase.cxx +++ b/editeng/source/accessibility/AccessibleContextBase.cxx @@ -175,7 +175,6 @@ uno::Reference< XAccessibleContext> SAL_CALL AccessibleContextBase::getAccessibleContext() throw (uno::RuntimeException, std::exception) { - ThrowIfDisposed (); return this; } @@ -188,7 +187,6 @@ sal_Int32 SAL_CALL AccessibleContextBase::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { - ThrowIfDisposed (); return 0; } @@ -420,7 +418,6 @@ void SAL_CALL AccessibleContextBase::removeAccessibleEventListener ( OUString SAL_CALL AccessibleContextBase::getImplementationName() throw (css::uno::RuntimeException, std::exception) { - ThrowIfDisposed (); return OUString("AccessibleContextBase"); } @@ -434,7 +431,6 @@ uno::Sequence< OUString > SAL_CALL AccessibleContextBase::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) { - ThrowIfDisposed (); return { "com.sun.star.accessibility.Accessible", "com.sun.star.accessibility.AccessibleContext"}; @@ -443,17 +439,6 @@ uno::Sequence< OUString > SAL_CALL // XTypeProvider -uno::Sequence< css::uno::Type> - AccessibleContextBase::getTypes() - throw (css::uno::RuntimeException, std::exception) -{ - ThrowIfDisposed (); - - // This class supports no interfaces on its own. Just return those - // supported by the base class. - return WeakComponentImplHelper::getTypes(); -} - uno::Sequence<sal_Int8> SAL_CALL AccessibleContextBase::getImplementationId() throw (css::uno::RuntimeException, std::exception) diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index dc0c19a597d3..24bb87ee74c9 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -266,12 +266,6 @@ public: //===== XTypeProvider =================================================== - /** Returns a sequence of all supported interfaces. - */ - virtual css::uno::Sequence< css::uno::Type> SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; - /** Returns a implementation id. */ virtual css::uno::Sequence<sal_Int8> SAL_CALL diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index bcbebd314048..3821216cc34b 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -326,7 +326,11 @@ sal_Int32 SAL_CALL AccessibleShape::getAccessibleChildCount () throw (css::uno::RuntimeException, std::exception) { - ThrowIfDisposed (); + if (IsDisposed()) + { + return 0; + } + sal_Int32 nChildCount = 0; // Add the number of shapes that are children of this shape. |