Use std::unique_ptr for mpViewContact member instance of SdrPage.

And fix some const-incorrect-ness while at it.

Change-Id: I0314c8e5b73f1a7edce040b2a57fbc5d1081d70c
Reviewed-on: https://gerrit.libreoffice.org/20815
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>

3 files changed, 15 insertions, 15 deletions

diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 5c9fb17a6e27..a55607e65f56 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -45,7 +45,7 @@ sal_uInt32 ObjectContactOfObjListPainter::GetPaintObjectCount() const
     return maStartObjects.size();
 }
 
-ViewContact& ObjectContactOfObjListPainter::GetPaintObjectViewContact(sal_uInt32 nIndex) const
+ViewContact& ObjectContactOfObjListPainter::GetPaintObjectViewContact(sal_uInt32 nIndex)
 {
     const SdrObject* pObj = maStartObjects[nIndex];
     DBG_ASSERT(pObj, "ObjectContactOfObjListPainter: Corrupt SdrObjectVector (!)");
@@ -157,7 +157,7 @@ sal_uInt32 ObjectContactOfPagePainter::GetPaintObjectCount() const
     return (GetStartPage() ? 1L : 0L);
 }
 
-ViewContact& ObjectContactOfPagePainter::GetPaintObjectViewContact(sal_uInt32 /*nIndex*/) const
+ViewContact& ObjectContactOfPagePainter::GetPaintObjectViewContact(sal_uInt32 /*nIndex*/)
 {
     DBG_ASSERT(GetStartPage(), "ObjectContactOfPagePainter::GetPaintObjectViewContact: no StartPage set (!)");
     return GetStartPage()->GetViewContact();
diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
index 1376c37929cf..03516df99ec6 100644
--- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx
@@ -120,7 +120,7 @@ void PagePrimitiveExtractor::Invoke()
 drawinglayer::primitive2d::Primitive2DContainer PagePrimitiveExtractor::createPrimitive2DSequenceForPage(const DisplayInfo& /*rDisplayInfo*/)
 {
     drawinglayer::primitive2d::Primitive2DContainer xRetval;
-    const SdrPage* pStartPage = GetStartPage();
+    SdrPage* pStartPage = GetStartPage();
 
     if(pStartPage)
     {
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 583c4892823e..d6679ff36e57 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1061,18 +1061,22 @@ sdr::contact::ViewContact* SdrPage::CreateObjectSpecificViewContact()
     return new sdr::contact::ViewContactOfSdrPage(*this);
 }
 
-sdr::contact::ViewContact& SdrPage::GetViewContact() const
+const sdr::contact::ViewContact& SdrPage::GetViewContact() const
 {
-    if(!mpViewContact)
-    {
-        const_cast< SdrPage* >(this)->mpViewContact =
-            const_cast< SdrPage* >(this)->CreateObjectSpecificViewContact();
-    }
+    if (!mpViewContact)
+        const_cast<SdrPage*>(this)->mpViewContact.reset(
+            const_cast<SdrPage*>(this)->CreateObjectSpecificViewContact());
 
     return *mpViewContact;
 }
 
+sdr::contact::ViewContact& SdrPage::GetViewContact()
+{
+    if (!mpViewContact)
+        mpViewContact.reset(CreateObjectSpecificViewContact());
 
+    return *mpViewContact;
+}
 
 void SdrPageProperties::ImpRemoveStyleSheet()
 {
@@ -1273,11 +1277,7 @@ SdrPage::~SdrPage()
 
     TRG_ClearMasterPage();
 
-    if(mpViewContact)
-    {
-        delete mpViewContact;
-        mpViewContact = nullptr;
-    }
+    mpViewContact.reset();
 
     {
         delete mpSdrPageProperties;
@@ -1780,7 +1780,7 @@ bool SdrPage::checkVisibility(
 }
 
 // DrawContact support: Methods for handling Page changes
-void SdrPage::ActionChanged() const
+void SdrPage::ActionChanged()
 {
     // Do necessary ViewContact actions
     GetViewContact().ActionChanged();