diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-28 22:11:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-29 20:47:53 +0100 |
| commit | 0031ca43d892cb7d0b65e957adb8f3e95d83c9da (patch) | |
| tree | cab0cc9d13eaa725f0ffa77cefaa707e0b6c0d36 /sfx2/source/sidebar | |
| parent | 75d7a9ef706df23d5422e53217c13d1db8929021 (diff) | |
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.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/sidebar')
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 7 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarDockingWindow.cxx | 1 |
2 files changed, 3 insertions, 5 deletions
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> |