diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-03-26 10:09:03 +0000 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-03-26 15:03:34 +0100 |
| commit | 9c36592a068443e22f67bd290306b6f2771a8195 (patch) | |
| tree | 7ac8a5bcb03bf0db776079ff07511b5224406ad4 | |
| parent | 206e1ec3813a2d2765a206de75c70edd3b39f091 (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>
(cherry picked from commit dbf6468764879ef05fc2492b82a31299668c27b4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91114
| -rw-r--r-- | sw/qa/core/data/ww6/pass/ofz21385-1.doc | bin | 0 -> 481786 bytes | |||
| -rw-r--r-- | sw/source/filter/basflt/fltshell.cxx | 6 |
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 Binary files differnew file mode 100644 index 000000000000..311c6ed5fe8a --- /dev/null +++ b/sw/qa/core/data/ww6/pass/ofz21385-1.doc 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 |