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

[Noel Grandin (via logerrit)]

 sd/source/ui/framework/tools/FrameworkHelper.cxx |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

New commits:
commit f65e44b6dd9c6dd94905996764c261dc1fc4aecf
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 20:02:28 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 29 07:51:17 2021 +0100

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

diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx 
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index b3d84f923249..141d4cfe63e4 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -248,19 +248,18 @@ public:
 //----- Framework::DisposeListener 
---------------------------------------------
 
 namespace {
-    typedef ::cppu::WeakComponentImplHelper <
+    typedef comphelper::WeakComponentImplHelper <
         css::lang::XEventListener
         > FrameworkHelperDisposeListenerInterfaceBase;
 }
 
 class FrameworkHelper::DisposeListener
-    : public cppu::BaseMutex,
-      public FrameworkHelperDisposeListenerInterfaceBase
+    : public FrameworkHelperDisposeListenerInterfaceBase
 {
 public:
     explicit DisposeListener (const ::std::shared_ptr<FrameworkHelper>& 
rpHelper);
 
-    virtual void SAL_CALL disposing() override;
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
 
     virtual void SAL_CALL disposing (const lang::EventObject& rEventObject) 
override;
 
@@ -764,15 +763,14 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId (
 
 FrameworkHelper::DisposeListener::DisposeListener (
     const ::std::shared_ptr<FrameworkHelper>& rpHelper)
-    : FrameworkHelperDisposeListenerInterfaceBase(m_aMutex),
-      mpHelper(rpHelper)
+    : mpHelper(rpHelper)
 {
     Reference<XComponent> xComponent (mpHelper->mxConfigurationController, 
UNO_QUERY);
     if (xComponent.is())
         xComponent->addEventListener(this);
 }
 
-void SAL_CALL FrameworkHelper::DisposeListener::disposing()
+void FrameworkHelper::DisposeListener::disposing(std::unique_lock<std::mutex>&)
 {
     Reference<XComponent> xComponent (mpHelper->mxConfigurationController, 
UNO_QUERY);
     if (xComponent.is())