diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2015-12-20 14:17:19 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2015-12-21 00:24:34 +0000 |
| commit | 8c55875546aed040609858319707e2b91426fbe0 (patch) | |
| tree | 63300400a76d5ad790aece1d54a08fb0f562384a /svx | |
| parent | c6b11cf681f8e8d131031ea7e5d19c4b6473503a (diff) | |
Use std::unique_ptr for the SdrPageProperties member of SdrPage.
Change-Id: I37d95bd91c5bee1028eceda24e84b17162d0d2b1
Reviewed-on: https://gerrit.libreoffice.org/20844
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdpage.cxx | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index d6679ff36e57..870186ffc75f 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1219,7 +1219,7 @@ SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) aPrefVisiLayers.SetAll(); eListKind = (bMasterPage) ? SDROBJLIST_MASTERPAGE : SDROBJLIST_DRAWPAGE; - mpSdrPageProperties = new SdrPageProperties(*this); + mpSdrPageProperties.reset(new SdrPageProperties(*this)); } SdrPage::SdrPage(const SdrPage& rSrcPage) @@ -1278,12 +1278,7 @@ SdrPage::~SdrPage() TRG_ClearMasterPage(); mpViewContact.reset(); - - { - delete mpSdrPageProperties; - mpSdrPageProperties = nullptr; - } - + mpSdrPageProperties.reset(); } void SdrPage::lateInit(const SdrPage& rSrcPage, SdrModel* const pNewModel) @@ -1325,7 +1320,7 @@ void SdrPage::lateInit(const SdrPage& rSrcPage, SdrModel* const pNewModel) mbObjectsNotPersistent = rSrcPage.mbObjectsNotPersistent; { - mpSdrPageProperties = new SdrPageProperties(*this); + mpSdrPageProperties.reset(new SdrPageProperties(*this)); if(!IsMasterPage()) { @@ -1524,7 +1519,7 @@ void SdrPage::SetModel(SdrModel* pNewModel) // create new SdrPageProperties with new model (due to SfxItemSet there) // and copy ItemSet and StyleSheet - SdrPageProperties *pNew = new SdrPageProperties(*this); + std::unique_ptr<SdrPageProperties> pNew(new SdrPageProperties(*this)); if(!IsMasterPage()) { @@ -1533,8 +1528,7 @@ void SdrPage::SetModel(SdrModel* pNewModel) pNew->SetStyleSheet(getSdrPageProperties().GetStyleSheet()); - delete mpSdrPageProperties; - mpSdrPageProperties = pNew; + mpSdrPageProperties = std::move(pNew); } // update listeners at possible API wrapper object @@ -1792,7 +1786,15 @@ void SdrPage::ActionChanged() } } -// sdr::Comment interface +SdrPageProperties& SdrPage::getSdrPageProperties() +{ + return *mpSdrPageProperties; +} + +const SdrPageProperties& SdrPage::getSdrPageProperties() const +{ + return *mpSdrPageProperties; +} const SdrPageProperties* SdrPage::getCorrectSdrPageProperties() const { |