diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2017-04-23 01:53:13 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@libreoffice.org> | 2017-04-24 18:01:20 +0200 |
| commit | 83e5014a9339d7d92323517f5615b1c18c860e22 (patch) | |
| tree | 725816040ca490450ed8786335edad20a9414707 /sw/inc/frmfmt.hxx | |
| parent | 9223d88542a5b9272f98f37feb84cd78beacac42 (diff) | |
move SwFlyDrawContact ownership to SwFlyFrameFormat
Change-Id: I19a65638c7489f74cc7ae5fc08364a103551cd1a
Reviewed-on: https://gerrit.libreoffice.org/36878
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.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index c62895056200..c0da19b899a6 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -27,6 +27,7 @@ #include <list> class SwFlyFrame; +class SwFlyDrawContact; class SwAnchoredObject; class Graphic; class ImageMap; @@ -185,6 +186,7 @@ class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat so it can be used to move frames of non-resizable objects to align them correctly when they get borders (this is done in SwWrtShell::CalcAndGetScale) */ Point m_aLastFlyFramePrtRectPos; + SwFlyDrawContact* m_pContact; SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) = delete; SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete; @@ -193,6 +195,7 @@ protected: SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FLYFRMFMT ) + , m_pContact(nullptr) {} public: @@ -244,6 +247,8 @@ public: void SetLastFlyFramePrtRectPos( const Point &rPoint ) { m_aLastFlyFramePrtRectPos = rPoint; } DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat) + SwFlyDrawContact* GetOrCreateContact(); + void ClearContact(); }; //The DrawFrame-Format |