[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-5' - editeng/source

Caolán McNamara caolanm at redhat.com
Wed Dec 10 12:39:45 PST 2014


 editeng/source/editeng/editundo.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8660d1ebf9228cafec0082b5c69e596a03ae6f3c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 10 15:58:42 2014 +0000

    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)
    (cherry picked from commit a27bb66382687ce348db5f57a1e64ee6afcb5c43)
    Reviewed-on: https://gerrit.libreoffice.org/13423
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index 55d3b5c3..a0f7d16 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -187,7 +187,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 );
 


More information about the Libreoffice-commits mailing list