diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2015-12-17 23:08:08 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2015-12-18 23:42:45 +0000 |
| commit | a103c3456a2bd12c5c94124abeda06978caea609 (patch) | |
| tree | 027f2e29a7c4589f565ae81f8caf8060a37db720 /svx | |
| parent | dc89367a5622748dd7c37b89ac300a663b8b98e9 (diff) | |
Use std::unique_ptr for SdrLayerAdmin data member.
Change-Id: Ib49f52c94ae96b8bddec6718585d5d7d6e3d148d
Reviewed-on: https://gerrit.libreoffice.org/20806
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/svdraw/svdpage.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index a5828e270360..583c4892823e 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1203,7 +1203,7 @@ SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) nBordUpp(0L), nBordRgt(0L), nBordLwr(0L), - pLayerAdmin(new SdrLayerAdmin(&rNewModel.GetLayerAdmin())), + mpLayerAdmin(new SdrLayerAdmin(&rNewModel.GetLayerAdmin())), mpSdrPageProperties(nullptr), mpMasterPageDescriptor(nullptr), nPageNum(0L), @@ -1228,7 +1228,7 @@ SdrPage::SdrPage(const SdrPage& rSrcPage) nBordUpp(rSrcPage.nBordUpp), nBordRgt(rSrcPage.nBordRgt), nBordLwr(rSrcPage.nBordLwr), - pLayerAdmin(new SdrLayerAdmin(rSrcPage.pModel->GetLayerAdmin())), + mpLayerAdmin(new SdrLayerAdmin(rSrcPage.pModel->GetLayerAdmin())), mpSdrPageProperties(nullptr), mpMasterPageDescriptor(nullptr), nPageNum(rSrcPage.nPageNum), @@ -1269,7 +1269,7 @@ SdrPage::~SdrPage() // when they get called from PageInDestruction(). maPageUsers.clear(); - delete pLayerAdmin; + mpLayerAdmin.reset(); TRG_ClearMasterPage(); @@ -1506,11 +1506,11 @@ sal_Int32 SdrPage::GetLwrBorder() const void SdrPage::impl_setModelForLayerAdmin(SdrModel* const pNewModel) { if (pNewModel!=nullptr) { - pLayerAdmin->SetParent(&pNewModel->GetLayerAdmin()); + mpLayerAdmin->SetParent(&pNewModel->GetLayerAdmin()); } else { - pLayerAdmin->SetParent(nullptr); + mpLayerAdmin->SetParent(nullptr); } - pLayerAdmin->SetModel(pNewModel); + mpLayerAdmin->SetModel(pNewModel); } void SdrPage::SetModel(SdrModel* pNewModel) @@ -1661,6 +1661,16 @@ const SdrPageGridFrameList* SdrPage::GetGridFrameList(const SdrPageView* /*pPV*/ return nullptr; } +const SdrLayerAdmin& SdrPage::GetLayerAdmin() const +{ + return *mpLayerAdmin; +} + +SdrLayerAdmin& SdrPage::GetLayerAdmin() +{ + return *mpLayerAdmin; +} + OUString SdrPage::GetLayoutName() const { return OUString(); |