diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-07-31 18:39:36 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-09-19 10:18:22 +0200 |
| commit | 695d995c3006a7125e5733b76347d327d137d3bd (patch) | |
| tree | aecdf4bebfe3c2dc27133c5ca2f1a370f6bc0c56 /sw/source/core/layout/ssfrm.cxx | |
| parent | c35696fa02acbef92790fa136a39dd0bb3732964 (diff) | |
sw_redlinehide_2: show/hide footnotes in redlines
This requires some manual work to delete the footnote frames.
Change-Id: I2c5efccdd1e97f26e18402b809ca4f893147cba1
Diffstat (limited to 'sw/source/core/layout/ssfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/ssfrm.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index a5c4355fed1b..abe62e8b3968 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -443,7 +443,8 @@ SwContentFrame::~SwContentFrame() void SwTextFrame::RegisterToNode(SwTextNode & rNode) { assert(&rNode != GetDep()); - m_pMergedPara = sw::CheckParaRedlineMerge(*this, rNode); + // sw_redlinehide: use New here, because the only caller also calls lcl_ChangeFootnoteRef + m_pMergedPara = sw::CheckParaRedlineMerge(*this, rNode, sw::FrameMode::New); if (!m_pMergedPara) { rNode.Add(this); |