diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-28 20:56:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-29 17:25:54 +0100 |
| commit | 0c920406888f141d163ce2df01e707404f9e7acd (patch) | |
| tree | 360571f80c772846cc602380af577a4a1d8c1467 /sd | |
| parent | 69c083b5c47196b193345af29889126411f8e05a (diff) | |
use comphelper::WeakComponentImplHelper in CenterViewFocusModule
Change-Id: Ia326a78c3f96ac213a3d729e3c1deafc04f70ea1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127685
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/framework/module/CenterViewFocusModule.cxx | 5 | ||||
| -rw-r--r-- | sd/source/ui/framework/module/CenterViewFocusModule.hxx | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index ec1fc506126b..e36f95e33d9c 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -40,8 +40,7 @@ namespace sd::framework { //===== CenterViewFocusModule ==================================================== CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController> const & rxController) - : CenterViewFocusModuleInterfaceBase(m_aMutex), - mbValid(false), + : mbValid(false), mpBase(nullptr), mbNewViewCreated(false) { @@ -79,7 +78,7 @@ CenterViewFocusModule::~CenterViewFocusModule() { } -void SAL_CALL CenterViewFocusModule::disposing() +void CenterViewFocusModule::disposing(std::unique_lock<std::mutex>&) { if (mxConfigurationController.is()) mxConfigurationController->removeConfigurationChangeListener(this); diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx index 9cd12a077061..c6d5d348e3b2 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.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> namespace com::sun::star::drawing::framework { @@ -39,7 +38,7 @@ class ViewShellBase; namespace sd::framework { -typedef ::cppu::WeakComponentImplHelper<css::drawing::framework::XConfigurationChangeListener> +typedef comphelper::WeakComponentImplHelper<css::drawing::framework::XConfigurationChangeListener> CenterViewFocusModuleInterfaceBase; /** This module waits for new views to be created for the center pane and @@ -47,14 +46,14 @@ typedef ::cppu::WeakComponentImplHelper<css::drawing::framework::XConfigurationC we are moving away from the shell stack this module may become obsolete or has to be modified. */ -class CenterViewFocusModule : private cppu::BaseMutex, public CenterViewFocusModuleInterfaceBase +class CenterViewFocusModule final : public CenterViewFocusModuleInterfaceBase { public: explicit CenterViewFocusModule( css::uno::Reference<css::frame::XController> const& rxController); virtual ~CenterViewFocusModule() override; - virtual void SAL_CALL disposing() override; + virtual void disposing(std::unique_lock<std::mutex>&) override; // XConfigurationChangeListener |