diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-03 17:20:21 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-08-22 12:33:14 +0200 |
| commit | 11d7c4684672b719312b2c1d390f8e19a12ab411 (patch) | |
| tree | fd108936f17eb4d912701d3c2768247aaea11a3a | |
| parent | e8b8bccd3e879c16a09c6fe2a9884bd1946c291b (diff) | |
ofz#10198 reset uncommitted fly stuff & pams before applying redlining
Change-Id: I2a2587ec4590926f7cffc2a4d58a22d9d5f19c99
Reviewed-on: https://gerrit.libreoffice.org/59947
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Tested-by: Jenkins
(cherry picked from commit 887ee9111f42847406c5ffc85a0ba635080de3de)
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 2d117c19eaa2..afdacbdcb732 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -5490,6 +5490,9 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss) UpdateFields(); + m_xWFlyPara.reset(); + m_xSFlyPara.reset(); + // delete the pam before the call for hide all redlines (Bug 73683) if (m_bNewDoc) m_rDoc.getIDocumentRedlineAccess().SetRedlineFlags(eMode); |