[Libreoffice-commits] core.git: 2 commits - chart2/source include/sfx2 sfx2/source

[Noel Grandin (via logerrit)]

 chart2/source/controller/sidebar/Chart2PanelFactory.cxx |    1 -
 chart2/source/controller/sidebar/Chart2PanelFactory.hxx |   10 ++++------
 include/sfx2/sidebar/SidebarPanelBase.hxx               |   10 ++++------
 sfx2/source/sidebar/SidebarPanelBase.cxx                |    5 ++---
 4 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit b29e3131eace8f97d705a2cd76b18e18fa982654
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 21:27:16 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Dec 30 06:46:57 2021 +0100

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

diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx 
b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index b5bde521d031..081322b09408 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -40,7 +40,6 @@ using namespace css::uno;
 namespace chart::sidebar {
 
 ChartPanelFactory::ChartPanelFactory()
-    : PanelFactoryInterfaceBase(m_aMutex)
 {
 }
 
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx 
b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
index b218f4e41ebc..87619f647d70 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
@@ -18,21 +18,19 @@
  */
 #pragma once
 
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/XUIElementFactory.hpp>
 
 
 namespace chart::sidebar {
 
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
     css::ui::XUIElementFactory, css::lang::XServiceInfo
     > PanelFactoryInterfaceBase;
 
-class ChartPanelFactory
-    : private ::cppu::BaseMutex,
-      public PanelFactoryInterfaceBase
+class ChartPanelFactory final
+    : public PanelFactoryInterfaceBase
 {
 public:
     ChartPanelFactory();
commit d26d13f49ca3ee1972588e24246bf8d1abebdc42
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Wed Dec 29 08:45:05 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Dec 30 06:46:36 2021 +0100

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

diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx 
b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 8164244e796a..b00d4ca3cead 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -24,8 +24,7 @@
 
 #include <sfx2/dllapi.h>
 
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
 
 #include <com/sun/star/ui/XContextChangeEventListener.hpp>
 #include <com/sun/star/ui/XUIElement.hpp>
@@ -39,7 +38,7 @@ namespace sfx2::sidebar {
 
 class Panel;
 
-typedef cppu::WeakComponentImplHelper<css::ui::XContextChangeEventListener,
+typedef 
comphelper::WeakComponentImplHelper<css::ui::XContextChangeEventListener,
                                        css::ui::XUIElement,
                                        css::ui::XToolPanel,
                                        css::ui::XSidebarPanel,
@@ -49,8 +48,7 @@ typedef 
cppu::WeakComponentImplHelper<css::ui::XContextChangeEventListener,
 /** Base class for sidebar panels that provides some convenience
     functionality.
 */
-class SFX2_DLLPUBLIC SidebarPanelBase final : private ::cppu::BaseMutex,
-                                        public SidebarPanelBaseInterfaceBase
+class SFX2_DLLPUBLIC SidebarPanelBase final : public 
SidebarPanelBaseInterfaceBase
 {
 public:
     static css::uno::Reference<css::ui::XUIElement> Create(const OUString& 
rsResourceURL,
@@ -91,7 +89,7 @@ private:
     SidebarPanelBase(const SidebarPanelBase&) = delete;
     SidebarPanelBase& operator=( const SidebarPanelBase& ) = delete;
 
-    virtual void SAL_CALL disposing() override;
+    virtual void disposing(std::unique_lock<std::mutex>&) override;
 
     css::uno::Reference<css::frame::XFrame> mxFrame;
     std::unique_ptr<PanelLayout> mxControl;
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx 
b/sfx2/source/sidebar/SidebarPanelBase.cxx
index fd46b96b5c2a..f0829599e6db 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -52,8 +52,7 @@ SidebarPanelBase::SidebarPanelBase (
     const css::uno::Reference<css::frame::XFrame>& rxFrame,
     std::unique_ptr<PanelLayout> xControl,
     const css::ui::LayoutSize& rLayoutSize)
-    : SidebarPanelBaseInterfaceBase(m_aMutex),
-      mxFrame(rxFrame),
+    : mxFrame(rxFrame),
       mxControl(std::move(xControl)),
       msResourceURL(rsResourceURL),
       maLayoutSize(rLayoutSize)
@@ -78,7 +77,7 @@ void SidebarPanelBase::SetParentPanel(sfx2::sidebar::Panel* 
pPanel)
     mxControl->SetPanel(pPanel);
 }
 
-void SAL_CALL SidebarPanelBase::disposing()
+void SidebarPanelBase::disposing(std::unique_lock<std::mutex>&)
 {
     SolarMutexGuard aGuard;