commit 8a9b3a29ac4661c181ac56bf99767989a3b00ba8
author Stephan Bergmann <sbergman@redhat.com> Wed Feb 25 09:08:35 2015 +0100
committer Caolán McNamara <caolanm@redhat.com> Wed Feb 25 12:51:42 2015 +0000
tree 744d3cad242d92a1623a461d8689f667705dbe2c
parent 7aa27237372b6378cf53b1fb4caf12d1b8093045

Fix dangling pointer

Change-Id: I352702ac50708a8f8c40e2752821178223052b7c
(cherry picked from commit 1c4e95db104cd5f732bc41a539a7dc5fd9269ef6)
Reviewed-on: https://gerrit.libreoffice.org/14632
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/core/doc/doctxm.cxx

diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index fd8f452..dcd2996 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -156,6 +156,7 @@ void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
    SwTxtNode& rTxtNd = const_cast<SwTxtNode&>(pTxtTOXMark->GetTxtNode());
    OSL_ENSURE( rTxtNd.GetpSwpHints(), "cannot be deleted" );

    std::unique_ptr<SwRegHistory> aRHst;
    if (GetIDocumentUndoRedo().DoesUndo())
    {
        // save attributes for Undo
@@ -164,8 +165,8 @@ void SwDoc::DeleteTOXMark( const SwTOXMark* pTOXMark )
            RES_TXTATR_TOXMARK );
        GetIDocumentUndoRedo().AppendUndo( pUndo );

        SwRegHistory aRHst( rTxtNd, &pUndo->GetHistory() );
        rTxtNd.GetpSwpHints()->Register( &aRHst );
        aRHst.reset(new SwRegHistory(rTxtNd, &pUndo->GetHistory()));
        rTxtNd.GetpSwpHints()->Register(aRHst.get());
    }

    rTxtNd.DeleteAttribute( const_cast<SwTxtTOXMark*>(pTxtTOXMark) );