summaryrefslogtreecommitdiff
path: root/sw/inc/frmfmt.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@libreoffice.org>2017-04-23 14:56:49 +0200
committerBjörn Michaelsen <bjoern.michaelsen@libreoffice.org>2017-04-26 09:48:08 +0200
commit2c8a9d8a6e0933bb717d800e6ddfb2b0c6db1f96 (patch)
treee5d4bdd42b0673eea7838d142dc4b5324d6f3301 /sw/inc/frmfmt.hxx
parent8a23c68f58307b7cf2842cd4ce5a9eb93f8b244c (diff)
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/inc/frmfmt.hxx')
-rw-r--r--sw/inc/frmfmt.hxx9
1 files changed, 0 insertions, 9 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 6fec965473b1..2dd3c81a52f8 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -244,7 +244,6 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat)
SwFlyDrawContact* GetOrCreateContact();
- void ClearContact();
};
//The DrawFrame-Format
@@ -345,14 +344,6 @@ namespace sw
GetObjectConnectedHint(bool& risConnected, const SwRootFrame* pRoot) : m_risConnected(risConnected), m_pRoot(pRoot) {};
virtual ~GetObjectConnectedHint() override;
};
- struct SW_DLLPUBLIC KillDrawHint final : SfxHint
- {
- const SwFrame* m_pKillingFrame;
- bool& m_rbOtherFramesAround;
- SwFlyDrawContact*& m_rpContact;
- KillDrawHint(const SwFrame* pKillingFrame, bool& rbOtherFramesAround, SwFlyDrawContact*& rpContact) : m_pKillingFrame(pKillingFrame), m_rbOtherFramesAround(rbOtherFramesAround), m_rpContact(rpContact) {};
- virtual ~KillDrawHint() override;
- };
}
class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat