diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-07-27 16:33:06 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-07-28 09:59:28 +0200 |
| commit | 4c9b292bb4ff3ad516dad37e2e0dd0ac8bbb4aa0 (patch) | |
| tree | 0b4480f168957ee72a5f40c6a769fffd00de1db7 /sw/source/core/inc | |
| parent | 61b6b0f84f20275cee86602dc485585310cf6685 (diff) | |
Revert "tdf#132944 sw_redlinehide: delete of insert redline"
This reverts commit ad0351b84926075297fb74abbe9b31a0455782af.
It turns out that this conflicts with commit
14e87a4b15d31a34e6053f6194688f3aa23af991 "tdf#133967 sw_redlinehide: fix
redline deletion of table containing redlines"
but oddly enough that fix fixes tdf#132944 as well, but both commmits
combined don't work e.g. on node 1083/1084 in the tdf#133967 bugdoc we
got no text frame because SwUndoDelete has deleted it, but since it's
not merged it would be left alone by the new fix anyway.
This fix was quite hacky anyway, so just revert it.
Change-Id: Id17f3575c742b8761a8458914a28ae8047360fff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99522
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'sw/source/core/inc')
| -rw-r--r-- | sw/source/core/inc/UndoDelete.hxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx index 6e38201f3443..2faf346fee3c 100644 --- a/sw/source/core/inc/UndoDelete.hxx +++ b/sw/source/core/inc/UndoDelete.hxx @@ -60,7 +60,6 @@ class SwUndoDelete bool m_bResetPgDesc : 1; // TRUE: reset PgDsc on following node bool m_bResetPgBrk : 1; // TRUE: reset PgBreak on following node bool m_bFromTableCopy : 1; // TRUE: called by SwUndoTableCpyTable - bool m_bDisableMakeFrames : 1; bool SaveContent( const SwPosition* pStt, const SwPosition* pEnd, SwTextNode* pSttTextNd, SwTextNode* pEndTextNd ); @@ -101,7 +100,6 @@ public: // SwUndoTableCpyTable needs this information: bool IsDelFullPara() const { return m_bDelFullPara; } - void DisableMakeFrames() { m_bDisableMakeFrames = true; }; void dumpAsXml(xmlTextWriterPtr pWriter) const override; }; |