diff --git a/0001-tdf-129879-Fix-wrong-order-of-buttons.patch b/0001-tdf-129879-Fix-wrong-order-of-buttons.patch new file mode 100644 index 0000000..631b89e --- /dev/null +++ b/0001-tdf-129879-Fix-wrong-order-of-buttons.patch @@ -0,0 +1,28 @@ +From 9b51a4b02993524f42bbd4f19d982b88914b788f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= +Date: Wed, 8 Jan 2020 13:25:05 +0100 +Subject: [PATCH] tdf#129879 Fix wrong order of buttons + +Change-Id: I0cb135c5b8298fd7c5579673d0eaff7068a03842 +--- + vcl/source/window/layout.cxx | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx +index 981ac621aa60..9c5a36304a21 100644 +--- a/vcl/source/window/layout.cxx ++++ b/vcl/source/window/layout.cxx +@@ -718,8 +718,8 @@ static int getButtonPriority(const OString &rType) + const OUString &rEnv = Application::GetDesktopEnvironment(); + + if (rEnv.equalsIgnoreAsciiCase("windows") || +- rEnv.equalsIgnoreAsciiCase("tde") || +- rEnv.startsWithIgnoreAsciiCase("kde")) ++ rEnv.equalsIgnoreAsciiCase("lxqt") || ++ rEnv.startsWithIgnoreAsciiCase("plasma")) + { + pOrder = &aSaveDiscardCancel[0]; + } +-- +2.24.1 + diff --git a/libreoffice.changes b/libreoffice.changes index 992997b..8eae2d9 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 8 12:29:11 UTC 2020 - Tomáš Chvátal + +- Add patch to fix button ordering in Qt interface: + * 0001-tdf-129879-Fix-wrong-order-of-buttons.patch + ------------------------------------------------------------------- Sun Jan 5 03:59:38 UTC 2020 - Michael Gorse diff --git a/libreoffice.spec b/libreoffice.spec index c9126ff..b5426f2 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,7 +1,7 @@ # # spec file for package libreoffice # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -98,6 +98,7 @@ Patch1: scp2-user-config-suse.diff # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff +Patch4: 0001-tdf-129879-Fix-wrong-order-of-buttons.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -953,6 +954,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif # Leap 42/SLE-12 %patch2 %patch3 +%patch4 -p1 %patch990 -p1 %patch991 -p1