[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/core/crsr/crsrsh.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit b2fdb61446bc072ae1b6db380a584a87a1173f11
Author: Michael Stahl <mst...@redhat.com>
Date:   Wed Apr 26 14:51:40 2017 +0200

    tdf#107427 sw: fix crash when deleting header with selected table
    
    Restore resetting of the table cursor point position in
    SwCursorShell::ParkCursor(), which somehow prevents the crash.
    
    (regression from efc5995170f2ffe98374acb16a4f851bede6842d)
    
    Change-Id: Ia7ec2967c84cfcffe1718e9604d6b8506c3839a4

diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index f624de58079a..9fbf2f3ab497 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2550,6 +2550,8 @@ void SwCursorShell::ParkPams( SwPaM* pDelRg, 
SwShellCursor** ppDelRing )
             }
             else
             {
+                pTmpDel->GetPoint()->nContent.Assign(nullptr, 0);
+                pTmpDel->GetPoint()->nNode = 0;
                 pTmpDel->DeleteMark();
             }
             pTmpDel = nullptr;
@@ -2610,6 +2612,8 @@ void SwCursorShell::ParkCursor( const SwNodeIndex &rIdx )
                 SwNode* pTableNd = 
pTCursor->GetPoint()->nNode.GetNode().FindTableNode();
                 if ( pTableNd )
                 {
+                    pTCursor->GetPoint()->nContent.Assign(nullptr, 0);
+                    pTCursor->GetPoint()->nNode = 0;
                     pTCursor->DeleteMark();
                     pSh->m_pCurrentCursor->GetPoint()->nNode = *pTableNd;
                 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits