diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-02 10:21:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-03 08:21:39 +0200 |
| commit | 2b2223730b680a006b3380d3d44d59548b7bce65 (patch) | |
| tree | 5555c664101e712a72848ce241cd11b7fb4ce0d1 | |
| parent | 09cfe07c20636445c330e8a86b7e1bf9492144fb (diff) | |
loplugin:useuniqueptr in SdrPage
Change-Id: Ie3a471e67b7596c967a38b26c250f82f16b80e61
Reviewed-on: https://gerrit.libreoffice.org/53754
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | include/svx/svdpage.hxx | 2 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpage.cxx | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index f6899da1a86d..a4cc40feebd4 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -421,7 +421,7 @@ public: protected: // new MasterPageDescriptorVector - sdr::MasterPageDescriptor* mpMasterPageDescriptor; + std::unique_ptr<sdr::MasterPageDescriptor> mpMasterPageDescriptor; SdrLayerIDSet aPrefVisiLayers; sal_uInt16 nPageNum; diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 71207b6d4f88..a5d16568e049 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1413,7 +1413,7 @@ void SdrPage::TRG_SetMasterPage(SdrPage& rNew) if(mpMasterPageDescriptor) TRG_ClearMasterPage(); - mpMasterPageDescriptor = new sdr::MasterPageDescriptor(*this, rNew); + mpMasterPageDescriptor.reset(new sdr::MasterPageDescriptor(*this, rNew)); GetViewContact().ActionChanged(); } @@ -1426,8 +1426,7 @@ void SdrPage::TRG_ClearMasterPage() // the flushViewObjectContacts() will do needed invalidates by deleting the involved VOCs mpMasterPageDescriptor->GetUsedPage().GetViewContact().flushViewObjectContacts(); - delete mpMasterPageDescriptor; - mpMasterPageDescriptor = nullptr; + mpMasterPageDescriptor.reset(); } } |