diff options
author | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2017-04-23 14:56:49 +0200 |
---|---|---|
committer | Björn Michaelsen <bjoern.michaelsen@libreoffice.org> | 2017-04-26 09:48:08 +0200 |
commit | 2c8a9d8a6e0933bb717d800e6ddfb2b0c6db1f96 (patch) | |
tree | e5d4bdd42b0673eea7838d142dc4b5324d6f3301 /sw/source/core/layout/wsfrm.cxx | |
parent | vcl: add ErrorHandler unit tests (diff) | |
download | core-2c8a9d8a6e0933bb717d800e6ddfb2b0c6db1f96.tar.gz core-2c8a9d8a6e0933bb717d800e6ddfb2b0c6db1f96.zip |
remove this whole "kill SwFlyDrawContact with last frame" nonsense
- first of all, SwFlyDrawContact is part of the document state/model,
not the layout.
- SwWW8ImplReader::CreateContactObject() and
SwXFrame::GetOrCreateSdrObject() seem to agree as they create
SwFlyDrawContacts without caring for frames using them being around.
This was inherently fragile as FinitDrawObj would mercilessly kill the
SwFlyDrawContact in that case (and thus also modify document state).
- SwFlyDrawContact is now entirely owned by SwFlyFrameFormat.
Change-Id: I70b716fef63279552b39a18ac143024a460ba785
Reviewed-on: https://gerrit.libreoffice.org/36899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
Diffstat (limited to 'sw/source/core/layout/wsfrm.cxx')
-rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 6cf82e5fa852..a8ef49dfd3de 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -218,16 +218,6 @@ void SwTextFrame::CheckDirection( bool bVert ) true, bBrowseMode ); } -void SwFrame::SwClientNotify(const SwModify& rMod, const SfxHint& rHint) -{ - SwClient::SwClientNotify(rMod, rHint); - if (auto pKillDrawHint = dynamic_cast<const sw::KillDrawHint*>(&rHint)) - { - if(this != pKillDrawHint->m_pKillingFrame) - pKillDrawHint->m_rbOtherFramesAround = true; - } -} - void SwFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) { sal_uInt8 nInvFlags = 0; |