caolanm pushed to libreoffice (f21). "Related: rhbz#1183806 crash on pressing delete in empty pivot table lists"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Mar 26 17:34:06 UTC 2015
>From 2bb9f0b49af6afaa942df3a95d0c31442a464747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
Date: Thu, 26 Mar 2015 17:28:16 +0000
Subject: Related: rhbz#1183806 crash on pressing delete in empty pivot table
lists
diff --git a/0001-Related-fdo-88455-crash-using-delete-in-available-fi.patch b/0001-Related-fdo-88455-crash-using-delete-in-available-fi.patch
new file mode 100644
index 0000000..97c5597
--- /dev/null
+++ b/0001-Related-fdo-88455-crash-using-delete-in-available-fi.patch
@@ -0,0 +1,64 @@
+From f0fae54f44874a0da9e591f990ce5d2c906bff60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Mon, 2 Feb 2015 21:04:28 +0000
+Subject: [PATCH] Related: fdo#88455 crash using delete in available fields
+
+Change-Id: I4ac5fe6f42b425ee96124b2dde39ff397a081638
+(cherry picked from commit 1746c886362b8525b04365dd6b7203b8098b99ba)
+Reviewed-on: https://gerrit.libreoffice.org/14291
+Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
+Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
+---
+ sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 10 ++++++----
+ sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx | 10 ++++++----
+ 2 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+index e8f4805..33dbaa2 100644
+--- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
++++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx
+@@ -253,12 +253,14 @@ void ScPivotLayoutTreeListData::KeyInput(const KeyEvent& rKeyEvent)
+ KeyCode aCode = rKeyEvent.GetKeyCode();
+ sal_uInt16 nCode = aCode.GetCode();
+
+- switch (nCode)
++ if (nCode == KEY_DELETE)
+ {
+- case KEY_DELETE:
+- GetModel()->Remove(GetCurEntry());
+- return;
++ const SvTreeListEntry* pEntry = GetCurEntry();
++ if (pEntry)
++ GetModel()->Remove(pEntry);
++ return;
+ }
++
+ SvTreeListBox::KeyInput(rKeyEvent);
+ }
+
+diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
+index a094f2a..746b512 100644
+--- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
++++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx
+@@ -80,12 +80,14 @@ void ScPivotLayoutTreeListLabel::KeyInput(const KeyEvent& rKeyEvent)
+ KeyCode aCode = rKeyEvent.GetKeyCode();
+ sal_uInt16 nCode = aCode.GetCode();
+
+- switch (nCode)
++ if (nCode == KEY_DELETE)
+ {
+- case KEY_DELETE:
+- GetModel()->Remove(GetCurEntry());
+- return;
++ const SvTreeListEntry* pEntry = GetCurEntry();
++ if (pEntry)
++ GetModel()->Remove(pEntry);
++ return;
+ }
++
+ SvTreeListBox::KeyInput(rKeyEvent);
+ }
+
+--
+1.9.3
+
diff --git a/0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch b/0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch
deleted file mode 100644
index 0d75ab7..0000000
--- a/0001-Resolves-rhbz-1179642-crash-in-GetFocus-with-empty-m.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dae7d2089516d9cf014b9fad0adb484f19282a29 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
-Date: Sat, 24 Jan 2015 20:59:27 +0000
-Subject: [PATCH] Resolves: rhbz#1179642 crash in GetFocus with empty
- mpPreviouslyFocusedListBox
-
-Change-Id: I7559067c00617482d34e7cbdd177202868cbfc76
----
- sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
-index 84b61d4..ff0c95e 100644
---- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
-+++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx
-@@ -123,9 +123,10 @@ void ScPivotLayoutTreeListBase::GetFocus()
- if( GetGetFocusFlags() & GETFOCUS_MNEMONIC )
- {
- SvTreeListEntry* pEntry = mpParent->mpPreviouslyFocusedListBox->GetCurEntry();
-- InsertEntryForSourceTarget(pEntry, NULL);
-+ if (pEntry)
-+ InsertEntryForSourceTarget(pEntry, NULL);
-
-- if(mpParent->mpPreviouslyFocusedListBox != NULL)
-+ if (mpParent->mpPreviouslyFocusedListBox != NULL)
- mpParent->mpPreviouslyFocusedListBox->GrabFocus();
- }
-
---
-1.9.3
-
diff --git a/libreoffice.spec b/libreoffice.spec
index 0bac65b..e880e93 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 6%{?libo_prerelease}%{?dist}
+Release: 7%{?libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
Group: Applications/Productivity
URL: http://www.libreoffice.org/
@@ -375,6 +375,7 @@ Patch77: 0002-propagate-user-set-CFLAGS-to-build.patch
Patch78: 0001-fdo-69036-do-not-try-to-create-a-sfxApplication-when.patch
Patch79: 0001-Resolves-rhbz-1204244-group-sdb-windows-together-as-.patch
Patch80: 0001-Resolves-tdf-90256-repair-invalid-docking-positions.patch
+Patch81: 0001-Related-fdo-88455-crash-using-delete-in-available-fi.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@@ -2355,6 +2356,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Thu Mar 26 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.3.6.2-7.UNBUILT
+- Resolves: rhbz#1183806 crash on pressing delete in empty pivot table lists
+
* Thu Mar 26 2015 Caolán McNamara <caolanm at redhat.com> - 1:4.3.6.2-6
- Resolves: tdf#90256 repair invalid docking positions
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?h=f21&id=2bb9f0b49af6afaa942df3a95d0c31442a464747
More information about the scm-commits
mailing list