[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sw/source
Michael Stahl
mstahl at redhat.com
Thu Apr 27 20:14:28 UTC 2017
sw/source/core/crsr/crsrsh.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit adc0b3b214323d7588cadd17f2b4faafeb5e4e80
Author: Michael Stahl <mstahl at 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
(cherry picked from commit b2fdb61446bc072ae1b6db380a584a87a1173f11)
Reviewed-on: https://gerrit.libreoffice.org/37007
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 274a501f4856..aa158ceeb1e1 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2567,6 +2567,8 @@ void SwCursorShell::ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing )
}
else
{
+ pTmpDel->GetPoint()->nContent.Assign(nullptr, 0);
+ pTmpDel->GetPoint()->nNode = 0;
pTmpDel->DeleteMark();
}
pTmpDel = nullptr;
@@ -2627,6 +2629,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;
}
More information about the Libreoffice-commits
mailing list