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 /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 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/DeckLayouter.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/TabBar.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 5 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx index 0fc874c2e367..766159c58835 100644 --- a/sfx2/source/sidebar/DeckLayouter.cxx +++ b/sfx2/source/sidebar/DeckLayouter.cxx @@ -27,6 +27,7 @@ #include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/viewsh.hxx> #include <comphelper/lok.hxx> +#include <osl/diagnose.h> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index 878c87c67360..d874a3191300 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -31,6 +31,7 @@ #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <svtools/acceleratorexecute.hxx> +#include <osl/diagnose.h> using namespace css; using namespace css::uno; diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index c6238bb3def0..99fcdb67b10e 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -37,8 +37,7 @@ Theme& Theme::GetCurrentTheme() } Theme::Theme() - : ThemeInterfaceBase(m_aMutex), - mbIsHighContrastMode(Application::GetSettings().GetStyleSettings().GetHighContrastMode()), + : mbIsHighContrastMode(Application::GetSettings().GetStyleSettings().GetHighContrastMode()), mbIsHighContrastModeSetManually(false) { SetupPropertyMaps(); @@ -143,7 +142,7 @@ void Theme::UpdateTheme() } } -void SAL_CALL Theme::disposing() +void Theme::disposing(std::unique_lock<std::mutex>&) { SolarMutexGuard aGuard; |