From 0914e7410b65eb93fed4115bacef91996153ccf9 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 3 Nov 2020 22:07:24 +0100 Subject: WIP draft Change-Id: I1e059c41ad0c82fa3d7c17ab324b87fc3b840861 --- sw/source/core/layout/wsfrm.cxx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index fd3cb4a30677..5ab411897ffd 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -4306,10 +4306,11 @@ static void UnHideRedlines(SwRootFrame & rLayout, auto eMode(sw::FrameMode::Existing); for (SwTextFrame * pFrame : frames) { - if (rLayout.IsHideRedlines()) + if (rLayout.HasMergedParas()) { - assert(!pFrame->GetMergedPara() || - !rNode.IsCreateFrameWhenHidingRedlines()); +// nope: now switching from one mergedpara to different one +// assert(!pFrame->GetMergedPara() || +// !rNode.IsCreateFrameWhenHidingRedlines()); if (rNode.IsCreateFrameWhenHidingRedlines()) { { @@ -4417,9 +4418,12 @@ static void UnHideRedlines(SwRootFrame & rLayout, rNode.GetTableNode()->DelFrames(&rLayout); } } +#if 1 + // at this point it's false but it has no frames... if (!rNode.IsCreateFrameWhenHidingRedlines()) +#endif { - if (rLayout.IsHideRedlines()) + if (rLayout.HasMergedParas()) { if (rNode.IsContentNode()) { -- cgit