- Add patch to fix button ordering in Qt interface:

* 0001-tdf-129879-Fix-wrong-order-of-buttons.patch

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=846
This commit is contained in:
Tomáš Chvátal 2020-01-08 12:31:15 +00:00 committed by Git OBS Bridge
parent df0200db39
commit f5b79b7f82
3 changed files with 37 additions and 1 deletions

View File

@ -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?= <tchvatal@suse.com>
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 8 12:29:11 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
- 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 <mgorse@suse.com> Sun Jan 5 03:59:38 UTC 2020 - Michael Gorse <mgorse@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package libreoffice # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch2: nlpsolver-no-broken-help.diff Patch2: nlpsolver-no-broken-help.diff
Patch3: mediawiki-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 # try to save space by using hardlinks
Patch990: install-with-hardlinks.diff Patch990: install-with-hardlinks.diff
# save time by relying on rpm check rather than doing stupid find+grep # 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 %endif # Leap 42/SLE-12
%patch2 %patch2
%patch3 %patch3
%patch4 -p1
%patch990 -p1 %patch990 -p1
%patch991 -p1 %patch991 -p1