diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-11 13:18:56 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-17 18:04:07 +0100 |
| commit | a92411b1abfde9a45551055f89addd352d52ebba (patch) | |
| tree | 84aeb7234c708f54c5c719268cc19ef765329fe7 /sw/source/core/layout/wsfrm.cxx | |
| parent | fb2a383622115c853a8493d60c5e0568644057a1 (diff) | |
sw_redlinehide_4b: SwRootFrame::SetHideRedlines() disable early return
... for now, because this is the only thing that deletes existing
sw::MergedPara instances.
Change-Id: If092df52e63de28de38129f0aa11ad08156855c4
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 9cebf22c8229..0a3d6ee6b66d 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -4455,11 +4455,17 @@ void SwRootFrame::SetHideRedlines(bool const bHideRedlines) } mbHideRedlines = bHideRedlines; SwDoc & rDoc(*GetFormat()->GetDoc()); - if (!bHideRedlines // Show->Hide must init hidden number trees + // don't do early return if there are no redlines: + // Show->Hide must init hidden number trees + // Hide->Show may be called after all redlines have been deleted but there + // may still be MergedParas because those aren't deleted yet... +#if 0 + if (!bHideRedlines && rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty()) { return; } +#endif // Hide->Show: clear MergedPara, create frames // Show->Hide: call CheckParaRedlineMerge, delete frames // Traverse the document via the nodes-array; traversing via the layout |