diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2017-02-11 05:03:07 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2017-02-14 15:44:42 +0000 |
| commit | 837545feb63f31095d69d006aeda520637c3bc8c (patch) | |
| tree | e72cdf16a1ddaf0eae220e824be72cb98a9b7344 /sw | |
| parent | 4ae93f7d3b063d13ff757884444a468212227ef9 (diff) | |
DYING_FLYFRAMEFORMAT not needed anymore
Change-Id: Id9ded246752903f692c0f8254a258fada299d9bf
Reviewed-on: https://gerrit.libreoffice.org/34142
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 1 | ||||
| -rw-r--r-- | sw/source/core/draw/dcontact.cxx | 11 | ||||
| -rw-r--r-- | sw/source/core/layout/atrfrm.cxx | 2 |
3 files changed, 0 insertions, 14 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 6daa2ad2b848..9d40d967858a 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -262,7 +262,6 @@ namespace sw { enum class DrawFrameFormatHintId { DYING, - DYING_FLYFRAMEFORMAT, /* possibly can be merged with DYING, if all client handle it and handle it the same */ PREPPASTING, PREP_INSERT_FLY, PREP_DELETE_FLY, diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index b0e2e9a01025..9a4c78eb3d18 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -594,17 +594,6 @@ void SwFlyDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint { pKillDrawHint->m_rpContact = this; } - else if (auto pDrawFrameFormatHint = dynamic_cast<const sw::DrawFrameFormatHint*>(&rHint)) - { - switch(pDrawFrameFormatHint->m_eId) - { - case sw::DrawFrameFormatHintId::DYING_FLYFRAMEFORMAT: - dynamic_cast<SwFlyFrameFormat*>(const_cast<SwModify*>(&rMod))->ClearContact(); - break; - default: - ; - } - } } // SwDrawContact diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index aff63bdec6e1..01c59236a505 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2889,8 +2889,6 @@ SwFlyFrameFormat::~SwFlyFrameFormat() { SwFrame::DestroyFrame(pLast); } while( nullptr != ( pLast = aIter.Next() )); - - CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::DYING_FLYFRAMEFORMAT)); } /// Creates the Frames if the format describes a paragraph-bound frame. |