vcl/inc/salinst.hxx | 1 - vcl/unx/gtk3/gtkdata.cxx | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)
New commits: commit 9d7fcd64b3a6e033e81576c9f2588c7d82ef2377 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Mar 13 23:20:15 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Mar 16 11:43:30 2026 +0100 vcl: Drop unused displayconnectiondispatch.hxx include Change-Id: If4d8410501942118582c16224a139b219d185b90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201688 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index eaaeb53332ed..3eaa97d526ce 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -32,7 +32,6 @@ #include <vcl/weld/weld.hxx> #include "ClipboardSelectionType.hxx" -#include "displayconnectiondispatch.hxx" #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/dnd/XDragSource.hpp> commit 97c434fd241fc5206bf5da7146b3a6d9304ecfc4 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Mar 13 22:39:40 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Mar 16 11:43:17 2026 +0100 gtk: Use correct desktop environment identifier strings in comparison "tde" is no longer used and KDE Plasma environments are identified by "PLASMA5" and "PLASMA6", respectively, see SalGetDesktopEnvironment. Change-Id: I9cd5076a3eeca8b8c02a121add8dd1cec18c77a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201686 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/unx/gtk3/gtkdata.cxx b/vcl/unx/gtk3/gtkdata.cxx index 42ef8badc9be..b508e366935e 100644 --- a/vcl/unx/gtk3/gtkdata.cxx +++ b/vcl/unx/gtk3/gtkdata.cxx @@ -927,8 +927,7 @@ int getButtonPriority(std::u16string_view rType) const OUString &rEnv = Application::GetDesktopEnvironment(); if (rEnv.equalsIgnoreAsciiCase("windows") || - rEnv.equalsIgnoreAsciiCase("tde") || - rEnv.startsWithIgnoreAsciiCase("kde")) + rEnv.startsWithIgnoreAsciiCase("plasma")) { pOrder = &aSaveDiscardCancel[0]; }
