| commit | 6767a309b7c3ddd283a83bcf7dc36fecaf9cc6b9 | |
| author | Michael Stahl <michael.stahl@allotropia.de> | |
| Tue, 17 May 2022 12:09:08 +0000 (17 14:09 +0200) | ||
| committer | Caolán McNamara <caolanm@redhat.com> | |
| Wed, 18 May 2022 08:39:11 +0000 (18 10:39 +0200) | ||
| tree | 87de522063fed84e5681f5f7d45499c06eb81769 | treesnapshot (tar.gz zip) |
| parent | 4bced2b78b3e22730c12d9729f5633ae1a3a35c8 | commitdiff |
tdf#148461 sw_redlinehide: fix assert in SwContentNode::DelFrames()
The assert(pMerged->pFirstNode->GetIndex() <= i) is intended for when
frames are really deleted, but CheckParaRedlineMerge() calls it while
the now-outdated MergedPara is still on the frame, but the nodes already
have new flags; assign a dummy node in this situation.
Change-Id: I23fbfdb6901e6e15abf92913aa252e59877bc280
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134475
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 6ee57b39ba912f0902714d8c4d1a267511a3c6ca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134446
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
The assert(pMerged->pFirstNode->GetIndex() <= i) is intended for when
frames are really deleted, but CheckParaRedlineMerge() calls it while
the now-outdated MergedPara is still on the frame, but the nodes already
have new flags; assign a dummy node in this situation.
Change-Id: I23fbfdb6901e6e15abf92913aa252e59877bc280
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134475
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 6ee57b39ba912f0902714d8c4d1a267511a3c6ca)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134446
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| sw/source/core/docnode/node.cxx | diffblobblamehistory |