chart2/source/controller/inc/ChartToolbarController.hxx | 10 ++++------
chart2/source/controller/main/ToolbarController.cxx | 3 +--
include/sfx2/sidebar/SidebarController.hxx | 10 ++++------
sfx2/source/sidebar/SidebarController.cxx | 7 ++-----
sfx2/source/sidebar/SidebarDockingWindow.cxx | 1 +
5 files changed, 12 insertions(+), 19 deletions(-)
New commits:
commit a67fc38496a7a621357cf156e17ba12bdf05b3c7
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 21:21:44 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 29 20:48:06 2021 +0100
use comphelper::WeakComponentImplHelper in ChartToolbarController
Change-Id: I21fab4cc23221a4965231e6e8c477c7a24e4b5fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127689
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx
b/chart2/source/controller/inc/ChartToolbarController.hxx
index 647cd59a6685..08b4e1eecb7f 100644
--- a/chart2/source/controller/inc/ChartToolbarController.hxx
+++ b/chart2/source/controller/inc/ChartToolbarController.hxx
@@ -9,8 +9,7 @@
#pragma once
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
#include <com/sun/star/frame/XToolbarController.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
@@ -23,13 +22,12 @@ namespace com::sun::star::frame { class XFramesSupplier; }
namespace chart {
-typedef cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
css::frame::XToolbarController, css::frame::XStatusListener,
css::util::XUpdatable, css::lang::XInitialization,
css::lang::XServiceInfo> ChartToolbarControllerBase;
-class ChartToolbarController : private cppu::BaseMutex,
- public ChartToolbarControllerBase
+class ChartToolbarController : public ChartToolbarControllerBase
{
public:
ChartToolbarController(const css::uno::Sequence<css::uno::Any>&
rProperties);
@@ -69,7 +67,7 @@ public:
// XUpdatable
virtual void SAL_CALL update() override;
- using cppu::WeakComponentImplHelperBase::disposing;
+ using comphelper::WeakComponentImplHelperBase::disposing;
private:
diff --git a/chart2/source/controller/main/ToolbarController.cxx
b/chart2/source/controller/main/ToolbarController.cxx
index b985558a3a0b..495afe526ded 100644
--- a/chart2/source/controller/main/ToolbarController.cxx
+++ b/chart2/source/controller/main/ToolbarController.cxx
@@ -19,8 +19,7 @@ namespace com::sun::star::uno { class XComponentContext; }
namespace chart {
-ChartToolbarController::ChartToolbarController(const
css::uno::Sequence<css::uno::Any>& rProperties):
- ChartToolbarControllerBase(m_aMutex)
+ChartToolbarController::ChartToolbarController(const
css::uno::Sequence<css::uno::Any>& rProperties)
{
css::uno::Reference<css::frame::XFrame> xFrame;
sal_Int32 nLength = rProperties.getLength();
commit 0031ca43d892cb7d0b65e957adb8f3e95d83c9da
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 22:11:00 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 29 20:47:53 2021 +0100
use comphelper::WeakComponentImplHelper in SidebarController
Change-Id: Ied30f3aaa33b6f3eb3b13c9731f9a92293fefb77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127696
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/sfx2/sidebar/SidebarController.hxx
b/include/sfx2/sidebar/SidebarController.hxx
index 0a09f993dbad..baedec092484 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -37,14 +37,13 @@
#include <com/sun/star/ui/XSidebar.hpp>
#include <optional>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
+#include <comphelper/compbase.hxx>
namespace com::sun::star::awt { class XWindow; }
namespace com::sun::star::frame { class XDispatch; }
namespace com::sun::star::ui { class XUIElement; }
-typedef cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
css::ui::XContextChangeEventListener,
css::beans::XPropertyChangeListener,
css::ui::XSidebar,
@@ -61,8 +60,7 @@ class DeckDescriptor;
class SidebarDockingWindow;
class SFX2_DLLPUBLIC SidebarController final
- : private ::cppu::BaseMutex,
- public SidebarControllerInterfaceBase
+ : public SidebarControllerInterfaceBase
{
public:
static rtl::Reference<SidebarController> create(SidebarDockingWindow*
pParentWindow,
@@ -294,7 +292,7 @@ private:
*/
void ShowPanel (const Panel& rPanel);
- virtual void SAL_CALL disposing() override;
+ virtual void disposing(std::unique_lock<std::mutex>&) override;
std::unique_ptr<ResourceManager> mpResourceManager;
diff --git a/sfx2/source/sidebar/SidebarController.cxx
b/sfx2/source/sidebar/SidebarController.cxx
index 279b602cb2a6..eb1bfc5bbb9a 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -110,8 +110,7 @@ namespace {
SidebarController::SidebarController (
SidebarDockingWindow* pParentWindow,
const SfxViewFrame* pViewFrame)
- : SidebarControllerInterfaceBase(m_aMutex),
- mpParentWindow(pParentWindow),
+ : mpParentWindow(pParentWindow),
mpViewFrame(pViewFrame),
mxFrame(pViewFrame->GetFrame().GetFrameInterface()),
mpTabBar(VclPtr<TabBar>::Create(
@@ -273,7 +272,7 @@ namespace
};
}
-void SAL_CALL SidebarController::disposing()
+void SidebarController::disposing(std::unique_lock<std::mutex>&)
{
SolarMutexGuard aSolarMutexGuard;
@@ -359,8 +358,6 @@ void SAL_CALL SidebarController::notifyContextChangeEvent
(const css::ui::Contex
void SAL_CALL SidebarController::disposing (const css::lang::EventObject& )
{
- SolarMutexGuard aSolarMutexGuard;
-
dispose();
}
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index c8f847fffb3b..71e55767450e 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -33,6 +33,7 @@
#include <vcl/event.hxx>
#include <comphelper/lok.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <osl/diagnose.h>
#include <boost/property_tree/json_parser.hpp>
