sw/inc/frmfmt.hxx | 1 - sw/source/core/draw/dcontact.cxx | 11 ----------- sw/source/core/layout/atrfrm.cxx | 1 - 3 files changed, 13 deletions(-)
New commits: commit a917902c48f21d04039da86048c5c36555137d7e Author: Bjoern Michaelsen <bjoern.michael...@libreoffice.org> Date: Sun Apr 23 03:35:11 2017 +0200 remove DYING_FLYFRAMEFORMAT: now obsolete Change-Id: If82cdcb184069058209e1b23a50b699433dcdfe7 Reviewed-on: https://gerrit.libreoffice.org/36898 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michael...@libreoffice.org> diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index caad71fc14cd..9302682ec687 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -257,7 +257,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 8c36edad704b..03607dbe4b5e 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -653,17 +653,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: - const_cast<SwFlyFrameFormat*>(dynamic_cast<const SwFlyFrameFormat*>(&rMod))->ClearContact(); - break; - default: - ; - } - } } // SwDrawContact diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index e8ae3f185a9d..0a239eb1e3d0 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -2853,7 +2853,6 @@ SwFlyFrameFormat::~SwFlyFrameFormat() SwFrame::DestroyFrame(pLast); } while( nullptr != ( pLast = aIter.Next() )); - CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::DYING_FLYFRAMEFORMAT)); ClearContact(); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits