sw/qa/core/data/ww6/pass/ofz21385-1.doc |binary sw/source/filter/basflt/fltshell.cxx | 6 ++++++ 2 files changed, 6 insertions(+)
New commits: commit 9c36592a068443e22f67bd290306b6f2771a8195 Author: Caolán McNamara <caol...@redhat.com> AuthorDate: Thu Mar 26 10:09:03 2020 +0000 Commit: Michael Stahl <michael.st...@cib.de> CommitDate: Thu Mar 26 15:03:34 2020 +0100 ofz#21385 SwFltAnchor FrameFormat deleted Change-Id: If2beeb112c98d65355714f0946001d3738eddded Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91090 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.st...@cib.de> (cherry picked from commit dbf6468764879ef05fc2492b82a31299668c27b4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91114 diff --git a/sw/qa/core/data/ww6/pass/ofz21385-1.doc b/sw/qa/core/data/ww6/pass/ofz21385-1.doc new file mode 100644 index 000000000000..311c6ed5fe8a Binary files /dev/null and b/sw/qa/core/data/ww6/pass/ofz21385-1.doc differ diff --git a/sw/source/filter/basflt/fltshell.cxx b/sw/source/filter/basflt/fltshell.cxx index b95c9fa232ae..e6e0517a0489 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -998,6 +998,12 @@ void SwFltAnchorListener::Notify(const SfxHint& rHint) if(pFrameFormat) m_pFltAnchor->SetFrameFormat(pFrameFormat); } + else if (auto pDrawFrameFormatHint = dynamic_cast<const sw::DrawFrameFormatHint*>(&rHint)) + { + if (pDrawFrameFormatHint->m_eId != sw::DrawFrameFormatHintId::DYING) + return; + m_pFltAnchor->SetFrameFormat(nullptr); + } } // methods of SwFltRedline follow _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits