diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2017-02-11 02:43:52 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2017-02-14 15:44:28 +0000 |
| commit | 4ae93f7d3b063d13ff757884444a468212227ef9 (patch) | |
| tree | 1ea140821bedb3a8565fe0de7ee720efd3bdab3f /sw/inc/frmfmt.hxx | |
| parent | 183a7fc3ca46876a3ac10832bcd068d559132b4d (diff) | |
give SwFlyDrawContact a clear owner: SwFlyFrameFormat
Change-Id: Ida24ef9ae65ae8658645496369673d886e0935cc
Reviewed-on: https://gerrit.libreoffice.org/34141
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/inc/frmfmt.hxx')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index b55ca5d7abd0..6daa2ad2b848 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -174,11 +174,15 @@ public: // The FlyFrame-Format +class SdrModel; +class SwFlyDrawContact; + class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat { friend class SwDoc; OUString msTitle; OUString msDesc; + std::unique_ptr<SwFlyDrawContact> m_pContact; /** Both not existent. it stores the previous position of Prt rectangle from RequestObjectResize @@ -190,12 +194,13 @@ class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete; protected: - SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, - SwFrameFormat *pDrvdFrame ) - : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FLYFRMFMT ) - {} + SwFlyFrameFormat(SwAttrPool& rPool, const OUString& rFormatNm, SwFrameFormat* pDrvdFrame); public: + SwFlyDrawContact* GetContact() + { return m_pContact.get(); }; + void InitContact(SdrModel* pSdrModel); + void ClearContact(); virtual ~SwFlyFrameFormat() override; /// Creates the views. |