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 /include/sfx2 | |
| 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 'include/sfx2')
| -rw-r--r-- | include/sfx2/sidebar/SidebarController.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
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; |