[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/layout/frmtool.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6910f03678b93e92bd7dfb43ee6b2356a550de2e
Author:     Michael Stahl <Michael.Stahl at cib.de>
AuthorDate: Mon Jul 27 18:11:30 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Thu Jul 30 11:31:28 2020 +0200

    tdf#133967 sw_redlinehide: delete existing MergedPara before
    
    ... creating new one in RecreateStartTextFrames().
    
    This was causing a problem with duplicate call of AddToListRLHidden() on
    a node that was already added by the existing MergedPara; logically the
    add would need to be reverted when the existing MergedPara dies, but
    there's no count on it, so the safe way to fix this is to delete
    existing MergedPara first.
    
    This was on node 1083 in the bugdoc.
    
    Change-Id: I1fec613829b3b12e3846fc4b195559d9a6079560
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99523
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>
    (cherry picked from commit c363568fcedb6b7b425b735614db0600a0362ead)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99664
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 9765451c3aca..af968c9d3e58 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1379,6 +1379,8 @@ void RecreateStartTextFrames(SwTextNode & rNode)
             ? *pFrame->GetMergedPara()->pFirstNode
             : rNode);
         assert(rFirstNode.GetIndex() <= rNode.GetIndex());
+        // clear old one first to avoid DelFrames confusing updates & asserts...
+        pFrame->SetMergedPara(nullptr);
         pFrame->SetMergedPara(sw::CheckParaRedlineMerge(
                     *pFrame, rFirstNode, eMode));
         eMode = sw::FrameMode::New; // Existing is not idempotent!