3 files changed, 5 insertions, 22 deletions
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index c2b0d00c7c8c..2c5bc59204be 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 ();
     static const OUString sServiceNames[2] = {
             OUString("com.sun.star.accessibility.Accessible"),
             OUString("com.sun.star.accessibility.AccessibleContext")
@@ -445,17 +441,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 7f414ebe00dc..4fb4389cc80a 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 45bcf70c3551..8fc86ee4d38a 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.