summaryrefslogtreecommitdiff
path: root/sw/inc/txtftn.hxx
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-12-11 14:45:01 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-12-18 17:55:29 +0100
commit1b4fdcf1b13c0be54cd4c4423122580948445069 (patch)
tree5f281fd300d4a1cd60b5784e568637dc194e0445 /sw/inc/txtftn.hxx
parent87cf3bcccf9ba72caf97b3e4c37120ab8fca305c (diff)
sw_redlinehide_4b: FrameMode::Existing is not idempotent
... so use it only once. The problem is that the second time it will call DelFrames() on every non-first node, which then empties the first frame's newly created MergedPara instance. This can be reproduced by toggling Edit->Tracked Changes->Show in tdf99766-2.odt. Also change some function parameters on e.g. SwTextFootnote::DelFrames() to SwRootFrame to make it obvious that these don't actually need a particular SwTextFrame. Change-Id: I129be5db4a30546905c24c5e8820a5f105a33109
Diffstat (limited to 'sw/inc/txtftn.hxx')
-rw-r--r--sw/inc/txtftn.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index faf0c727e83a..9d6aa60ff49b 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -26,7 +26,7 @@ class SwNodeIndex;
class SwTextNode;
class SwNodes;
class SwDoc;
-class SwFrame;
+class SwRootFrame;
class SW_DLLPUBLIC SwTextFootnote : public SwTextAttr
{
@@ -51,7 +51,7 @@ public:
void MakeNewTextSection( SwNodes& rNodes );
// Delete the FootnoteFrame from page.
- void DelFrames( const SwFrame* );
+ void DelFrames(const SwRootFrame *);
// Check conditional paragraph styles.
void CheckCondColl();