diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org> | 2017-04-23 03:21:19 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@libreoffice.org> | 2017-04-25 00:44:51 +0200 |
| commit | 6bf8d7bb5df3a29b6540e0ff057c667dad61d907 (patch) | |
| tree | 9f0b37a71fbcfddd8335c25e07a49c82b8857b4d /sw/inc | |
| parent | 3190f83bf11560c4908a6b3ea3e82a8354648523 (diff) | |
use a unique_ptr to track the SwFlyDrawContact
Change-Id: I1b9058b41d1708efa4069e737c2247c6600403f5
Reviewed-on: https://gerrit.libreoffice.org/36897
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index c0da19b899a6..caad71fc14cd 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -186,18 +186,13 @@ 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; + std::unique_ptr<SwFlyDrawContact> m_pContact; SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) = delete; SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete; protected: - SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, - SwFrameFormat *pDrvdFrame ) - : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FLYFRMFMT ) - , m_pContact(nullptr) - {} - + SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ); public: virtual ~SwFlyFrameFormat() override; |