|
 |
db8e1c9 |
From 96eae5f3e81384ab46aeead1f84761bab6e6397d Mon Sep 17 00:00:00 2001
|
|
|
db8e1c9 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
db8e1c9 |
Date: Wed, 10 Dec 2014 15:58:42 +0000
|
|
|
db8e1c9 |
Subject: [PATCH] Resolves: fdo#87141 Remove deletes the node, release doesn't
|
|
|
db8e1c9 |
|
|
|
db8e1c9 |
regression from introduction of boost::ptr_vector originally one had to Remove
|
|
|
db8e1c9 |
and delete the return to delete it, while now the Remove automatically delete
|
|
|
db8e1c9 |
it. This bare Remove to just "release" it seems to have been overlooked
|
|
|
db8e1c9 |
|
|
|
db8e1c9 |
Change-Id: I175f7c95862ce47402993e5e3b8feaa93af43e75
|
|
|
db8e1c9 |
(cherry picked from commit efcbb12a27a380a442292f17c7f508555a66d4af)
|
|
|
db8e1c9 |
---
|
|
|
db8e1c9 |
editeng/source/editeng/editundo.cxx | 2 +-
|
|
|
db8e1c9 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
db8e1c9 |
|
|
|
db8e1c9 |
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
|
|
|
db8e1c9 |
index 02989df..3bc5ed3 100644
|
|
|
db8e1c9 |
--- a/editeng/source/editeng/editundo.cxx
|
|
|
db8e1c9 |
+++ b/editeng/source/editeng/editundo.cxx
|
|
|
db8e1c9 |
@@ -189,7 +189,7 @@ void EditUndoDelContent::Redo()
|
|
|
db8e1c9 |
pEE->RemoveParaPortion(nNode);
|
|
|
db8e1c9 |
|
|
|
db8e1c9 |
// Do not delete node, depends on the undo!
|
|
|
db8e1c9 |
- pEE->GetEditDoc().Remove( nNode );
|
|
|
db8e1c9 |
+ pEE->GetEditDoc().Release( nNode );
|
|
|
db8e1c9 |
if (pEE->IsCallParaInsertedOrDeleted())
|
|
|
db8e1c9 |
pEE->ParagraphDeleted( nNode );
|
|
|
db8e1c9 |
|
|
|
db8e1c9 |
--
|
|
|
db8e1c9 |
1.9.3
|
|
|
db8e1c9 |
|