diff options
-rw-r--r-- | svx/source/accessibility/AccessibleShape.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 4dc9ab0b6987..b2ff186ae7cb 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -407,7 +407,9 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ::osl::MutexGuard aGuard (maMutex); Reference<XAccessibleStateSet> xStateSet; - if (IsDisposed()) + bool bDisposed = IsDisposed(); + + if (bDisposed) { // Return a minimal state set that only contains the DEFUNC state. xStateSet = AccessibleContextBase::getAccessibleStateSet (); @@ -458,7 +460,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL xStateSet.set( new ::utl::AccessibleStateSetHelper (*pStateSet)); } } - if (mpParent && mpParent->IsDocumentSelAll()) + if (!bDisposed && mpParent && mpParent->IsDocumentSelAll()) { ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(xStateSet.get()); |