Resolves: tdf#103032 a11y crash on listbox dispose in toolbar dropdown

Change-Id: I70bce310ba9b46efdbdfdec8d2c6689d0ba2e655

2 files changed, 5 insertions, 13 deletions

diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx
index 9b20b0b04d54..a8aa753ca479 100644
--- a/accessibility/inc/standard/vclxaccessiblelist.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelist.hxx
@@ -22,7 +22,6 @@
 
 #include <vector>
 #include <functional>
-#include "standard/vclxaccessiblelistitem.hxx"
 #include <standard/vclxaccessibleedit.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
@@ -136,6 +135,7 @@ public:
 
     void UpdateFocus_Impl_Acc ( sal_Int32 nPos, bool b_IsDropDownList) ;
     static void NotifyListItem(css::uno::Any& val);
+    ::accessibility::IComboListBoxHelper* getListBoxHelper() { return m_pListBoxHelper; }
 protected:
     BoxType     m_aBoxType;
     ::accessibility::IComboListBoxHelper* m_pListBoxHelper;
diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 405ecb5e6496..fb5cab491606 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -30,6 +30,7 @@
 #include <cppuhelper/compbase6.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/accessibletexthelper.hxx>
+#include <standard/vclxaccessiblelist.hxx>
 
 // forward ---------------------------------------------------------------
 
@@ -40,11 +41,6 @@ namespace com { namespace sun { namespace star { namespace awt {
     class XFocusListener;
 } } } }
 
-namespace accessibility
-{
-    class IComboListBoxHelper;
-}
-
 // class VCLXAccessibleListItem ------------------------------------------
 
 typedef ::cppu::WeakAggComponentImplHelper6< css::accessibility::XAccessible
@@ -69,9 +65,8 @@ private:
 protected:
     /// client id in the AccessibleEventNotifier queue
     sal_uInt32                          m_nClientId;
-    ::accessibility::IComboListBoxHelper*       m_pListBoxHelper;
 
-    css::uno::Reference< css::accessibility::XAccessible >        m_xParent;
+    css::uno::Reference< VCLXAccessibleList >                     m_xParent;
     css::uno::Reference< css::accessibility::XAccessibleContext > m_xParentContext;
 
 protected:
@@ -87,16 +82,13 @@ protected:
 
 public:
     /** OAccessibleBase needs a valid view
-        @param  _pListBoxHelper
-            is the list- or combobox for which we implement an accessible object
         @param  _nIndexInParent
             is the position of the entry inside the listbox
         @param  _xParent
             is our parent accessible object
     */
-    VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper,
-                            sal_Int32 _nIndexInParent,
-                            const css::uno::Reference< css::accessibility::XAccessible >& _xParent );
+    VCLXAccessibleListItem(sal_Int32 _nIndexInParent,
+                           const css::uno::Reference< VCLXAccessibleList >& _xParent);
 
     void                    NotifyAccessibleEvent(  sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue );