[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Michael Weghorn (via logerrit)]

 vcl/inc/qt5/QtAccessibleEventListener.hxx |    5 +----
 vcl/qt5/QtAccessibleEventListener.cxx     |    6 ++----
 vcl/qt5/QtAccessibleWidget.cxx            |    3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

New commits:
commit 48baddac8f175e628a854f78304a19238e25d529
Author:     Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 16 11:54:20 2022 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Aug 16 22:27:49 2022 +0200

    qt a11y: Drop QtAccessibleEventListener's XAccessible reference
    
    `QtAccessibleEventListener` was holding a reference
    to the `XAccessible` but not making use of it.
    
    The `QtAccessibleWidget` class that actually
    operates on the `XAccessible` is holding its own reference
    in its `m_xAccessible` member, so there's no need for
    the corresponding `QtAccessibleEventListener` to
    hold another one.
    
    Change-Id: I5b838e55d8285b4e52287dc8c9c70e06e45ab317
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138363
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/inc/qt5/QtAccessibleEventListener.hxx 
b/vcl/inc/qt5/QtAccessibleEventListener.hxx
index 1103dc9da598..f6c7c4866ec0 100644
--- a/vcl/inc/qt5/QtAccessibleEventListener.hxx
+++ b/vcl/inc/qt5/QtAccessibleEventListener.hxx
@@ -21,9 +21,7 @@ class QtAccessibleEventListener final
     : public cppu::WeakImplHelper<css::accessibility::XAccessibleEventListener>
 {
 public:
-    QtAccessibleEventListener(
-        const css::uno::Reference<css::accessibility::XAccessible> xAccessible,
-        QtAccessibleWidget* pAccessibleWidget);
+    explicit QtAccessibleEventListener(QtAccessibleWidget* pAccessibleWidget);
 
     virtual void SAL_CALL
     notifyEvent(const css::accessibility::AccessibleEventObject& aEvent) 
override;
@@ -31,7 +29,6 @@ public:
     virtual void SAL_CALL disposing(const css::lang::EventObject& Source) 
override;
 
 private:
-    css::uno::Reference<css::accessibility::XAccessible> m_xAccessible;
     QtAccessibleWidget* m_pAccessibleWidget;
 
     static void HandleStateChangedEvent(QAccessibleInterface* 
pQAccessibleInterface,
diff --git a/vcl/qt5/QtAccessibleEventListener.cxx 
b/vcl/qt5/QtAccessibleEventListener.cxx
index d109e4b5c844..ee562a4eca38 100644
--- a/vcl/qt5/QtAccessibleEventListener.cxx
+++ b/vcl/qt5/QtAccessibleEventListener.cxx
@@ -35,10 +35,8 @@ using namespace css::accessibility;
 using namespace css::lang;
 using namespace css::uno;
 
-QtAccessibleEventListener::QtAccessibleEventListener(const 
Reference<XAccessible> xAccessible,
-                                                     QtAccessibleWidget* 
pAccessibleWidget)
-    : m_xAccessible(xAccessible)
-    , m_pAccessibleWidget(pAccessibleWidget)
+QtAccessibleEventListener::QtAccessibleEventListener(QtAccessibleWidget* 
pAccessibleWidget)
+    : m_pAccessibleWidget(pAccessibleWidget)
 {
 }
 
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index 7fa4cd297778..d6370877f449 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -68,8 +68,7 @@ QtAccessibleWidget::QtAccessibleWidget(const 
Reference<XAccessible> xAccessible,
     Reference<XAccessibleEventBroadcaster> xBroadcaster(xContext, UNO_QUERY);
     if (xBroadcaster.is())
     {
-        Reference<XAccessibleEventListener> xListener(
-            new QtAccessibleEventListener(xAccessible, this));
+        Reference<XAccessibleEventListener> xListener(new 
QtAccessibleEventListener(this));
         xBroadcaster->addAccessibleEventListener(xListener);
     }
 }