diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-09-02 13:35:34 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-11-24 14:57:09 +0100 |
| commit | ce2c13089560fb43b3bd5f75f0446af7a62eb7c9 (patch) | |
| tree | ecfc18745625c2933b3f102cb3720e2ffcbb0595 | |
| parent | 890e1f782f06dd2c55092de3eabe5114edee78bf (diff) | |
ofz#38011 save and restore m_pLastAnchorPos via UnoCursor
when we do some operations that may delete paragraphs
Change-Id: I2165dd287771f06c6d0fd061dd7659b06db4bd72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121511
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit bc7baa18435000f47f90e47d3300710bcb4cf56b)
| -rw-r--r-- | sw/qa/core/data/ww8/pass/ofz38011-1.doc | bin | 0 -> 63022 bytes | |||
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/core/data/ww8/pass/ofz38011-1.doc b/sw/qa/core/data/ww8/pass/ofz38011-1.doc Binary files differnew file mode 100644 index 000000000000..8ef58ca5395d --- /dev/null +++ b/sw/qa/core/data/ww8/pass/ofz38011-1.doc diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 4fb74703ee2b..a2c8bc832ab8 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -2753,8 +2753,17 @@ void WW8TabDesc::FinishSwTable() { m_pIo->m_xRedlineStack->closeall(*m_pIo->m_pPaM->GetPoint()); m_pIo->m_aFrameRedlines.emplace(std::move(m_pIo->m_xRedlineStack)); + + // ofz#38011 drop m_pLastAnchorPos during RedlineStack dtor and restore it afterwards to the same + // place, or somewhere close if that place got destroyed + std::shared_ptr<SwUnoCursor> xLastAnchorCursor(m_pIo->m_pLastAnchorPos ? m_pIo->m_rDoc.CreateUnoCursor(*m_pIo->m_pLastAnchorPos) : nullptr); + m_pIo->m_pLastAnchorPos.reset(); + m_pIo->m_xRedlineStack = std::move(mxOldRedlineStack); + if (xLastAnchorCursor) + m_pIo->m_pLastAnchorPos.reset(new SwPosition(*xLastAnchorCursor->GetPoint())); + WW8DupProperties aDup(m_pIo->m_rDoc,m_pIo->m_xCtrlStck.get()); m_pIo->m_xCtrlStck->SetAttr( *m_pIo->m_pPaM->GetPoint(), 0, false); |