From dbf6468764879ef05fc2492b82a31299668c27b4 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 26 Mar 2020 10:09:03 +0000 Subject: ofz#21385 SwFltAnchor FrameFormat deleted Change-Id: If2beeb112c98d65355714f0946001d3738eddded Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91090 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sw/qa/core/data/ww6/pass/ofz21385-1.doc | Bin 0 -> 481786 bytes sw/source/filter/basflt/fltshell.cxx | 6 ++++++ 2 files changed, 6 insertions(+) create mode 100644 sw/qa/core/data/ww6/pass/ofz21385-1.doc (limited to 'sw') 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 e6ab4c67fe47..9659b75e573a 100644 --- a/sw/source/filter/basflt/fltshell.cxx +++ b/sw/source/filter/basflt/fltshell.cxx @@ -971,6 +971,12 @@ void SwFltAnchorListener::Notify(const SfxHint& rHint) if(pFrameFormat) m_pFltAnchor->SetFrameFormat(pFrameFormat); } + else if (auto pDrawFrameFormatHint = dynamic_cast(&rHint)) + { + if (pDrawFrameFormatHint->m_eId != sw::DrawFrameFormatHintId::DYING) + return; + m_pFltAnchor->SetFrameFormat(nullptr); + } } // methods of SwFltRedline follow -- cgit