diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-22 15:04:18 +0200 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-19 10:08:55 +0200 |
commit | d99e8dd4d4675dc1be86ec8cbed6d75066c18503 (patch) | |
tree | 85da1602f4f4cc95fbd51838f0a58f4327c9a0a3 | |
parent | a061e9d1fa150bc75fc84960fb90afda9eb784ed (diff) |
sw_redlinehide_2: DelFrames is called for hidden nodes too now
Change-Id: I9933d8b8ee29bb4da74819d7d2350a5b2b04aa09
-rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 57b6f698e0da..dc3076d8e933 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -4333,8 +4333,11 @@ static void UnHideRedlines(SwRootFrame & rLayout, { if (rNode.IsContentNode()) { - // note: no-op for NonFirst nodes, only Hidden will delete - static_cast<SwContentNode&>(rNode).DelFrames(&rLayout); + // note: nothing to do here, already done +#ifndef NDEBUG + auto const pFrame(static_cast<SwContentNode&>(rNode).getLayoutFrame(&rLayout)); + assert(!pFrame || static_cast<SwTextFrame*>(pFrame)->GetMergedPara()->pFirstNode != &rNode); +#endif } else if (rNode.IsTableNode()) { |