summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-03-26 10:09:03 +0000
committerMichael Stahl <michael.stahl@cib.de>2020-03-26 14:13:52 +0100
commitdbf6468764879ef05fc2492b82a31299668c27b4 (patch)
treefbb7fbadde617486bc8ae27e963edc79dde0ed8c /sw
parent56a1f9bea2f1b64dee4111ec6671caf42ef63c91 (diff)
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.stahl@cib.de>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/core/data/ww6/pass/ofz21385-1.docbin0 -> 481786 bytes
-rw-r--r--sw/source/filter/basflt/fltshell.cxx6
2 files changed, 6 insertions, 0 deletions
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
--- /dev/null
+++ b/sw/qa/core/data/ww6/pass/ofz21385-1.doc
Binary files 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<const sw::DrawFrameFormatHint*>(&rHint))
+ {
+ if (pDrawFrameFormatHint->m_eId != sw::DrawFrameFormatHintId::DYING)
+ return;
+ m_pFltAnchor->SetFrameFormat(nullptr);
+ }
}
// methods of SwFltRedline follow