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

[Noel Grandin (via logerrit)]

 sd/source/ui/sidebar/PanelFactory.cxx |    5 -----
 sd/source/ui/sidebar/PanelFactory.hxx |   12 ++++--------
 2 files changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 1a4310cab738076e492206ca5b38a2ecfb61d62a
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 27 20:37:23 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 28 07:31:43 2021 +0100

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

diff --git a/sd/source/ui/sidebar/PanelFactory.cxx 
b/sd/source/ui/sidebar/PanelFactory.cxx
index 04df3580adb6..c7ca8c25c4c8 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -46,7 +46,6 @@ namespace sd::sidebar {
 //----- PanelFactory --------------------------------------------------------
 
 PanelFactory::PanelFactory()
-    : PanelFactoryInterfaceBase(m_aMutex)
 {
 }
 
@@ -54,10 +53,6 @@ PanelFactory::~PanelFactory()
 {
 }
 
-void SAL_CALL PanelFactory::disposing()
-{
-}
-
 // XUIElementFactory
 
 Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx 
b/sd/source/ui/sidebar/PanelFactory.hxx
index 590a7349cc00..77fc17dbcd35 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -18,20 +18,18 @@
  */
 #pragma once
 
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
 
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 
 namespace sd::sidebar {
 
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
     css::ui::XUIElementFactory
     > PanelFactoryInterfaceBase;
 
-class PanelFactory
-    : private ::cppu::BaseMutex,
-      public PanelFactoryInterfaceBase
+class PanelFactory final
+    : public PanelFactoryInterfaceBase
 {
 public:
     explicit PanelFactory ();
@@ -39,8 +37,6 @@ public:
     PanelFactory(const PanelFactory&) = delete;
     PanelFactory& operator=(const PanelFactory&) = delete;
 
-    virtual void SAL_CALL disposing() override;
-
     // XUIElementFactory
 
     css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (