use comphelper::WeakComponentImplHelper in ChildrenManagerImpl

Change-Id: I24b1f497a77b7ff896060a8f7dacc5d3a5e27ea2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127411
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 6 insertions, 11 deletions

diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 2b8f5674b0d9..080d2a204b9d 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -69,10 +69,7 @@ ChildrenManagerImpl::ChildrenManagerImpl (
     const uno::Reference<drawing::XShapes>& rxShapeList,
     const AccessibleShapeTreeInfo& rShapeTreeInfo,
     AccessibleContextBase& rContext)
-    : ::cppu::WeakComponentImplHelper<
-          css::document::XEventListener,
-          css::view::XSelectionChangeListener>(m_aMutex),
-      mxShapeList (rxShapeList),
+    : mxShapeList (rxShapeList),
       mxParent (rxParent),
       maShapeTreeInfo (rShapeTreeInfo),
       mrContext (rContext),
@@ -83,8 +80,7 @@ ChildrenManagerImpl::ChildrenManagerImpl (
 
 ChildrenManagerImpl::~ChildrenManagerImpl()
 {
-    DBG_ASSERT (rBHelper.bDisposed || rBHelper.bInDispose,
-        "~AccessibleDrawDocumentView: object has not been disposed");
+    DBG_ASSERT (m_bDisposed, "~AccessibleDrawDocumentView: object has not been disposed");
 }
 
 
@@ -694,7 +690,7 @@ void ChildrenManagerImpl::impl_dispose()
 }
 
 
-void SAL_CALL ChildrenManagerImpl::disposing()
+void ChildrenManagerImpl::disposing()
 {
     impl_dispose();
 }
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 1956a7650fc4..6cd9a76305b5 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -24,7 +24,7 @@
 #include <svx/IAccessibleParent.hxx>
 #include <svx/AccessibleShapeTreeInfo.hxx>
 #include <editeng/AccessibleContextBase.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 #include <tools/gen.hxx>
 #include <vector>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -72,8 +72,7 @@ typedef ::std::vector<ChildDescriptor> ChildDescriptorListType;
     @see ChildrenManager
 */
 class ChildrenManagerImpl final
-    :   public cppu::BaseMutex,
-        public cppu::WeakComponentImplHelper<
+    :   public comphelper::WeakComponentImplHelper<
             css::document::XEventListener,
             css::view::XSelectionChangeListener>,
         public IAccessibleViewForwarderListener,
@@ -316,7 +315,7 @@ private:
     /** This method is called from the component helper base class while
         disposing.
     */
-    virtual void SAL_CALL disposing() override;
+    virtual void disposing() override;
 
     void impl_dispose();