diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-28 20:10:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-29 07:17:39 +0100 |
| commit | 140c06ce5bc049addae56c7c3de296a20042d255 (patch) | |
| tree | b41485fa56507bb7808b929c7b8f0f3fa735df69 /sd/source/ui/framework | |
| parent | 37862564f3452f4bd588c0f49a200c3c9c182f2b (diff) | |
use comphelper::WeakComponentImplHelper in SlideSorterModule
Change-Id: I5acc47ba25c9dd293a21e4d634fc82eb239a7b06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127659
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/framework')
| -rw-r--r-- | sd/source/ui/framework/module/SlideSorterModule.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/framework/module/SlideSorterModule.hxx | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx index 3f0d86b97adb..b254a16dc0cd 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.cxx +++ b/sd/source/ui/framework/module/SlideSorterModule.cxx @@ -48,8 +48,7 @@ namespace sd::framework { SlideSorterModule::SlideSorterModule ( const Reference<frame::XController>& rxController, const OUString& rsLeftPaneURL) - : SlideSorterModuleBase(m_aMutex), - mxResourceId(FrameworkHelper::CreateResourceId(FrameworkHelper::msSlideSorterURL, rsLeftPaneURL)), + : mxResourceId(FrameworkHelper::CreateResourceId(FrameworkHelper::msSlideSorterURL, rsLeftPaneURL)), mxMainViewAnchorId(FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL)), mxViewTabBarId(FrameworkHelper::CreateResourceId( FrameworkHelper::msViewTabBarURL, @@ -231,7 +230,7 @@ bool SlideSorterModule::IsResourceActive ( return (maActiveMainViewContainer.find(rsMainViewURL) != maActiveMainViewContainer.end()); } -void SAL_CALL SlideSorterModule::disposing() +void SlideSorterModule::disposing(std::unique_lock<std::mutex>&) { if (mxConfigurationController.is()) { diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx index adae19e1755f..bec9f5c3cad9 100644 --- a/sd/source/ui/framework/module/SlideSorterModule.hxx +++ b/sd/source/ui/framework/module/SlideSorterModule.hxx @@ -20,8 +20,7 @@ #pragma once #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> -#include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> +#include <comphelper/compbase.hxx> #include <memory> #include <set> @@ -32,7 +31,7 @@ namespace com::sun::star::frame { class XController; } namespace sd::framework { -typedef ::cppu::WeakComponentImplHelper < +typedef comphelper::WeakComponentImplHelper < css::drawing::framework::XConfigurationChangeListener > SlideSorterModuleBase; @@ -45,9 +44,8 @@ typedef ::cppu::WeakComponentImplHelper < deactivated or activated manually by the user then the ResourceManager detects this and remembers it for the future. */ -class SlideSorterModule - : private cppu::BaseMutex, - public SlideSorterModuleBase +class SlideSorterModule final + : public SlideSorterModuleBase { public: SlideSorterModule ( @@ -62,7 +60,7 @@ public: bool IsResourceActive (const OUString& rsMainViewURL); void SaveResourceState(); - virtual void SAL_CALL disposing() override; + virtual void disposing(std::unique_lock<std::mutex>&) override; // XConfigurationChangeListener virtual void SAL_CALL notifyConfigurationChange ( |