[Libreoffice-commits] core.git: sc/source

[Noel Grandin (via logerrit)]

 sc/source/ui/inc/ChartRangeSelectionListener.hxx    |    8 +++-----
 sc/source/ui/unoobj/ChartRangeSelectionListener.cxx |    3 +--
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 60625112f53014b296fe3f26198408f9795ad935
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sat Dec 25 21:10:40 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 08:00:06 2021 +0100

    use comphelper::WeakComponentImplHelper in ScChartRangeSelectionListener
    
    Change-Id: I1efac3114b3661ce1d65974d828af7715d5a0d74
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127530
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx 
b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
index 5bfb80652393..b7033c413713 100644
--- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx
+++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
@@ -18,20 +18,18 @@
  */
 #pragma once
 
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 class ScTabViewShell;
 
-typedef ::cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
         css::view::XSelectionChangeListener,
         css::lang::XServiceInfo >
     ScChartRangeSelectionListener_Base;
 
 class ScChartRangeSelectionListener :
-    public cppu::BaseMutex,
     public ScChartRangeSelectionListener_Base
 {
 public:
@@ -49,7 +47,7 @@ protected:
 
     // ____ WeakComponentImplHelperBase ____
     // is called when dispose() is called at this component
-    virtual void SAL_CALL disposing() override;
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
 
     // ____ XServiceInfo ____
     virtual OUString SAL_CALL getImplementationName() override;
diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx 
b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
index 696258a8bcf0..eae58aee6f7a 100644
--- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
+++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
@@ -34,7 +34,6 @@ SC_SIMPLE_SERVICE_INFO( ScChartRangeSelectionListener, 
"ScChartRangeSelectionLis
                         SC_SERVICENAME_CHRANGEHILIGHT )
 
 ScChartRangeSelectionListener::ScChartRangeSelectionListener( ScTabViewShell * 
pViewShell ) :
-        ScChartRangeSelectionListener_Base( m_aMutex ),
         m_pViewShell( pViewShell )
 {}
 
@@ -64,7 +63,7 @@ void SAL_CALL ScChartRangeSelectionListener::disposing( const 
lang::EventObject&
 }
 
 // ____ WeakComponentImplHelperBase ____
-void SAL_CALL ScChartRangeSelectionListener::disposing()
+void ScChartRangeSelectionListener::disposing(std::unique_lock<std::mutex>&)
 {
     m_pViewShell = nullptr;
 }