vcl/win/gdi/salnativewidgets-luna.cxx | 5 -----
vcl/win/window/salframe.cxx | 3 ---
2 files changed, 8 deletions(-)
New commits:
commit db4c4676b70bb5f9a1c169735e8fbe92b097a57b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Aug 16 19:30:10 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 17 12:40:02 2022 +0200
Related: tdf#118320 don't require experimental to be set anymore
Change-Id: Iba42eaa820001651a596b9708504fcc796b406ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138381
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx
b/vcl/win/gdi/salnativewidgets-luna.cxx
index fe7aabdc0405..ec86df4e963d 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -36,7 +36,6 @@
#include <osl/diagnose.h>
#include <osl/module.h>
#include <o3tl/char16_t2wchar_t.hxx>
-#include <officecfg/Office/Common.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
@@ -400,10 +399,6 @@ static bool implDrawNativeMenuMark(HDC hDC, HTHEME hTheme,
RECT rc, ControlPart
bool UseDarkMode()
{
- static bool bExperimental =
officecfg::Office::Common::Misc::ExperimentalMode::get();
- if (!bExperimental)
- return false;
-
HINSTANCE hUxthemeLib = LoadLibraryExW(L"uxtheme.dll", nullptr,
LOAD_LIBRARY_SEARCH_SYSTEM32);
if (!hUxthemeLib)
return false;
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 6dad2785179c..da8a12bf81a9 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -256,9 +256,6 @@ void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT
*pParentRect )
static void UpdateDarkMode(HWND hWnd)
{
- static bool bExperimental =
officecfg::Office::Common::Misc::ExperimentalMode::get();
- if (!bExperimental)
- return;
static bool bOSSupportsDarkMode = OSSupportsDarkMode();
if (!bOSSupportsDarkMode)
return;
