diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-12-28 22:14:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-12-29 19:50:02 +0100 |
| commit | 94fbd711d0184b847ba78b70114ce9bdde04a63b (patch) | |
| tree | 90627f52753c90bbabf022607d02b9ab688665b1 /include/sfx2 | |
| parent | b66bc8fb918acd19ee0bd02312e7506db43d8317 (diff) | |
use comphelper::WeakComponentImplHelper in Theme
Change-Id: Ia50d3919cb8a13781a43f00d102c556a82744ed9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127697
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/sidebar/Theme.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index f75f4724526e..a3f827f4a5d1 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -21,8 +21,7 @@ #include <sfx2/dllapi.h> #include <tools/color.hxx> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/basemutex.hxx> +#include <comphelper/compbase.hxx> #include <com/sun/star/beans/XPropertySet.hpp> @@ -32,7 +31,7 @@ namespace sfx2::sidebar { -typedef cppu::WeakComponentImplHelper < +typedef comphelper::WeakComponentImplHelper < css::beans::XPropertySet, css::beans::XPropertySetInfo > ThemeInterfaceBase; @@ -41,8 +40,7 @@ typedef cppu::WeakComponentImplHelper < look of the sidebar and its controls. */ class SFX2_DLLPUBLIC Theme final - : private ::cppu::BaseMutex, - public ThemeInterfaceBase + : public ThemeInterfaceBase { public: enum ThemeItem @@ -94,7 +92,7 @@ public: Theme(const Theme&) = delete; Theme& operator=( const Theme& ) = delete; - virtual void SAL_CALL disposing() override; + virtual void disposing(std::unique_lock<std::mutex>&) override; static css::uno::Reference<css::beans::XPropertySet> GetPropertySet(); |