core.git: editeng/source sd/source svx/source

[Michael Weghorn (via logerrit)]

 editeng/source/accessibility/AccessibleContextBase.cxx    |    2 +-
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |    8 ++++----
 sd/source/ui/accessibility/AccessibleOutlineView.cxx      |    4 ++--
 svx/source/accessibility/AccessibleShape.cxx              |    4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit a6d08b80bc014a92cfe3fced0ec09d3a1cc1cffa
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Apr 29 18:55:02 2025 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Apr 29 23:12:08 2025 +0200

    a11y: Use OAccessibleComponentHelper::isAlive
    
    Use it to implement (inverted) logic in
    AccessibleContextBase::IsDisposed and replace uses
    of the latter in subclasses by using the (protected)
    OAccessibleComponentHelper::isAlive directly.
    
    Change-Id: Ib033097dfac9e7a986cb0334caf7ac568ad4300a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184793
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
    Tested-by: Jenkins

diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx 
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 93c6a2fb3bad..0f28c6bb2c63 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -417,7 +417,7 @@ void AccessibleContextBase::CommitChange (
 
 bool AccessibleContextBase::IsDisposed() const
 {
-    return (rBHelper.bDisposed || rBHelper.bInDispose);
+    return !isAlive();
 }
 
 
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx 
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 2a93a8e4cda2..806ab4a938d9 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -457,7 +457,7 @@ void SAL_CALL AccessibleDocumentViewBase::propertyChange 
(const beans::PropertyC
 void SAL_CALL
     AccessibleDocumentViewBase::windowResized (const css::awt::WindowEvent& )
 {
-    if( IsDisposed() )
+    if (!isAlive())
         return;
 
     ViewForwarderChanged();
@@ -466,7 +466,7 @@ void SAL_CALL
 void SAL_CALL
     AccessibleDocumentViewBase::windowMoved (const css::awt::WindowEvent& )
 {
-    if( IsDisposed() )
+    if (!isAlive())
         return;
 
     ViewForwarderChanged();
@@ -475,7 +475,7 @@ void SAL_CALL
 void SAL_CALL
     AccessibleDocumentViewBase::windowShown (const css::lang::EventObject& )
 {
-    if( IsDisposed() )
+    if (!isAlive())
         return;
 
     ViewForwarderChanged();
@@ -484,7 +484,7 @@ void SAL_CALL
 void SAL_CALL
     AccessibleDocumentViewBase::windowHidden (const css::lang::EventObject& )
 {
-    if( IsDisposed() )
+    if (!isAlive())
         return;
 
     ViewForwarderChanged();
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx 
b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 620585df1d4b..771033f47114 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -142,7 +142,7 @@ OUString SAL_CALL
 void SAL_CALL AccessibleOutlineView::addAccessibleEventListener( const 
uno::Reference< XAccessibleEventListener >& xListener )
 {
     // delegate listener handling to children manager.
-    if ( ! IsDisposed())
+    if (isAlive())
         maTextHelper.AddEventListener(xListener);
     AccessibleContextBase::addEventListener(xListener);
 }
@@ -150,7 +150,7 @@ void SAL_CALL 
AccessibleOutlineView::addAccessibleEventListener( const uno::Refe
 void SAL_CALL AccessibleOutlineView::removeAccessibleEventListener( const 
uno::Reference< XAccessibleEventListener >& xListener )
 {
     // forward
-    if ( ! IsDisposed())
+    if (isAlive())
         maTextHelper.RemoveEventListener(xListener);
     AccessibleContextBase::removeEventListener(xListener);
 }
diff --git a/svx/source/accessibility/AccessibleShape.cxx 
b/svx/source/accessibility/AccessibleShape.cxx
index e4869c37e185..bdbadbacd0d4 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -300,7 +300,7 @@ OUString SAL_CALL 
AccessibleShape::getAccessibleDescription()
 sal_Int64 SAL_CALL
        AccessibleShape::getAccessibleChildCount ()
 {
-    if (IsDisposed())
+    if (!isAlive())
     {
         return 0;
     }
@@ -380,7 +380,7 @@ sal_Int64 SAL_CALL
 {
     ::osl::MutexGuard aGuard (m_aMutex);
 
-    if (IsDisposed())
+    if (!isAlive())
     {
         // Return a minimal state set that only contains the DEFUNC state.
         return AccessibleContextBase::getAccessibleStateSet ();