From 260ea19fb5e9aaa4ffff3f3ba06fc9c295be8d6a Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Sat, 25 Dec 2021 19:10:23 +0200
Subject: use comphelper::WeakComponentImplHelper in SelectionChangeHandler

Change-Id: Iab23271e69b9ae703444387ecca172361f67dfd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127527
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 sfx2/source/devtools/SelectionChangeHandler.hxx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'sfx2')

diff --git a/sfx2/source/devtools/SelectionChangeHandler.hxx b/sfx2/source/devtools/SelectionChangeHandler.hxx
index 523165f2f599..612f8e46ff33 100644
--- a/sfx2/source/devtools/SelectionChangeHandler.hxx
+++ b/sfx2/source/devtools/SelectionChangeHandler.hxx
@@ -17,10 +17,9 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
 
-typedef cppu::WeakComponentImplHelper<css::view::XSelectionChangeListener>
+typedef comphelper::WeakComponentImplHelper<css::view::XSelectionChangeListener>
     SelectionChangeHandlerInterfaceBase;
 
 /** Selection change handler to listen to document selection changes.
@@ -28,8 +27,7 @@ typedef cppu::WeakComponentImplHelper<css::view::XSelectionChangeListener>
  * Listens to the changes and notifies the docking window with a new
  * selected object, when a change happens.
  */
-class SelectionChangeHandler final : private ::cppu::BaseMutex,
-                                     public SelectionChangeHandlerInterfaceBase
+class SelectionChangeHandler final : public SelectionChangeHandlerInterfaceBase
 {
 private:
     css::uno::Reference<css::frame::XController> mxController;
@@ -38,8 +36,7 @@ private:
 public:
     SelectionChangeHandler(const css::uno::Reference<css::frame::XController>& rxController,
                            DevelopmentToolDockingWindow* pDockingWindow)
-        : SelectionChangeHandlerInterfaceBase(m_aMutex)
-        , mxController(rxController)
+        : mxController(rxController)
         , mpDockingWindow(pDockingWindow)
     {
         css::uno::Reference<css::view::XSelectionSupplier> xSupplier(mxController,
@@ -69,7 +66,7 @@ public:
     }
 
     virtual void SAL_CALL disposing(const css::lang::EventObject& /*rEvent*/) override {}
-    virtual void SAL_CALL disposing() override {}
+    using comphelper::WeakComponentImplHelperBase::disposing;
 
 private:
     SelectionChangeHandler(const SelectionChangeHandler&) = delete;
-- 
cgit