mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DYING_FLYFRAMEFORMAT not needed anymore

Browse Source 
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>
This commit is contained in:
Bjoern Michaelsen 2017-02-11 05:03:07 +01:00 committed by Björn Michaelsen
parent 4ae93f7d3b
commit 837545feb6
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sw/inc/frmfmt.hxx
View File

@ -262,7 +262,6 @@ namespace sw
{ {
enum class DrawFrameFormatHintId { enum class DrawFrameFormatHintId {
DYING, DYING,
DYING_FLYFRAMEFORMAT, /* possibly can be merged with DYING, if all client handle it and handle it the same */
PREPPASTING, PREPPASTING,
PREP_INSERT_FLY, PREP_INSERT_FLY,
PREP_DELETE_FLY, PREP_DELETE_FLY,

11
sw/source/core/draw/dcontact.cxx
View File

@ -594,17 +594,6 @@ void SwFlyDrawContact::SwClientNotify(const SwModify& rMod, const SfxHint& rHint
{ {
pKillDrawHint->m_rpContact = this; 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 // SwDrawContact

2
sw/source/core/layout/atrfrm.cxx
View File

@ -2889,8 +2889,6 @@ SwFlyFrameFormat::~SwFlyFrameFormat()
{ {
SwFrame::DestroyFrame(pLast); SwFrame::DestroyFrame(pLast);
} while( nullptr != ( pLast = aIter.Next() )); } while( nullptr != ( pLast = aIter.Next() ));
CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::DYING_FLYFRAMEFORMAT));
} }
/// Creates the Frames if the format describes a paragraph-bound frame. /// Creates the Frames if the format describes a paragraph-bound frame.