[libreoffice/f21] Resolves: rhbz#1173170 fix crash in impress undo

[Caolán McNamara]

commit e5968d0cdba0b5e0ec3887cbeaccf67b06ec5987
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 11 16:37:45 2014 +0000

    Resolves: rhbz#1173170 fix crash in impress undo

 ...o-87141-Remove-deletes-the-node-release-d.patch |   31 ++++++++++++++++++++
 libreoffice.spec                                   |    6 +++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-fdo-87141-Remove-deletes-the-node-release-d.patch b/0001-Resolves-fdo-87141-Remove-deletes-the-node-release-d.patch
new file mode 100644
index 0000000..6e0f239
--- /dev/null
+++ b/0001-Resolves-fdo-87141-Remove-deletes-the-node-release-d.patch
@@ -0,0 +1,31 @@
+From 96eae5f3e81384ab46aeead1f84761bab6e6397d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 10 Dec 2014 15:58:42 +0000
+Subject: [PATCH] Resolves: fdo#87141 Remove deletes the node, release doesn't
+
+regression from introduction of boost::ptr_vector originally one had to Remove
+and delete the return to delete it, while now the Remove automatically delete
+it. This bare Remove to just "release" it seems to have been overlooked
+
+Change-Id: I175f7c95862ce47402993e5e3b8feaa93af43e75
+(cherry picked from commit efcbb12a27a380a442292f17c7f508555a66d4af)
+---
+ editeng/source/editeng/editundo.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
+index 02989df..3bc5ed3 100644
+--- a/editeng/source/editeng/editundo.cxx
++++ b/editeng/source/editeng/editundo.cxx
+@@ -189,7 +189,7 @@ void EditUndoDelContent::Redo()
+     pEE->RemoveParaPortion(nNode);
+ 
+     // Do not delete node, depends on the undo!
+-    pEE->GetEditDoc().Remove( nNode );
++    pEE->GetEditDoc().Release( nNode );
+     if (pEE->IsCallParaInsertedOrDeleted())
+         pEE->ParagraphDeleted( nNode );
+ 
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index e8338b4..02a8ad2 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.1
-Release:        12%{?libo_prerelease}%{?dist}
+Release:        13%{?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/
@@ -368,6 +368,7 @@ Patch60: 0001-Resolves-rhbz-1164614-xslt-dialog-crashes-if-there-a.patch
 Patch61: 0001-ooo-93212-avoid-slicing-during-construction-of-SdrPa.patch
 Patch62: 0001-don-t-copy-stylesheet-s-HelpID-if-this-s-a-rename.patch
 Patch63: 0001-fdo-37682-paint-the-right-area.patch
+Patch64: 0001-Resolves-fdo-87141-Remove-deletes-the-node-release-d.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2343,6 +2344,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu Dec 11 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.4.1-13
+- Resolves: rhbz#1173170 fix crash in impress undo
+
 * Tue Dec 09 2014 David Tardon <dtardon at redhat.com> - 1:4.3.4.1-12
 - Resolves: fdo#37682 fix export of whole Draw page to PNG