sw: convert these SwFEShell members to std::unique_ptr

Change-Id: Ida2def93baf8d389e8000d5c31ac50dea7cd4c1b

3 files changed, 13 insertions, 22 deletions

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index dca10c7a9582..cac6a468386b 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -35,6 +35,7 @@
 #include <o3tl/typed_flags_set.hxx>
 
 #include <vector>
+#include <memory>
 
 namespace editeng { class SvxBorderLine; }
 
@@ -182,7 +183,8 @@ class SdrDropMarkerOverlay;
 class SW_DLLPUBLIC SwFEShell : public SwEditShell
 {
 private:
-    SdrDropMarkerOverlay *m_pChainFrom, *m_pChainTo;
+    std::unique_ptr<SdrDropMarkerOverlay> m_pChainTo;
+    std::unique_ptr<SdrDropMarkerOverlay> m_pChainFrom;
     bool m_bCheckForOLEInCaption;
 
     SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 9893d0f11a07..1ef1e8b05bb6 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -607,7 +607,8 @@ long SwFEShell::BeginDrag( const Point* pPt, bool bIsShift)
     SdrView *pView = Imp()->GetDrawView();
     if ( pView && pView->AreObjectsMarked() )
     {
-        delete m_pChainFrom; delete m_pChainTo; m_pChainFrom = m_pChainTo = nullptr;
+        m_pChainFrom.reset();
+        m_pChainTo.reset();
         SdrHdl* pHdl = pView->PickHandle( *pPt );
         if (pView->BegDragObj( *pPt, 0, pHdl ))
             pView->GetDragMethod()->SetShiftPressed( bIsShift );
@@ -2568,16 +2569,8 @@ void SwFEShell::Unchain( SwFrmFmt &rFmt )
 
 void SwFEShell::HideChainMarker()
 {
-    if (m_pChainFrom)
-    {
-        delete m_pChainFrom;
-        m_pChainFrom = nullptr;
-    }
-    if (m_pChainTo)
-    {
-        delete m_pChainTo;
-        m_pChainTo = nullptr;
-    }
+    m_pChainFrom.reset();
+    m_pChainTo.reset();
 }
 
 void SwFEShell::SetChainMarker()
@@ -2598,7 +2591,8 @@ void SwFEShell::SetChainMarker()
 
             if (!m_pChainFrom)
             {
-                m_pChainFrom = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
+                m_pChainFrom.reset(
+                    new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd ));
             }
         }
         if ( pFly->GetNextLink() )
@@ -2611,19 +2605,20 @@ void SwFEShell::SetChainMarker()
 
             if (!m_pChainTo)
             {
-                m_pChainTo = new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd );
+                m_pChainTo.reset(
+                    new SdrDropMarkerOverlay( *GetDrawView(), aStart, aEnd ));
             }
         }
     }
 
     if ( bDelFrom )
     {
-        delete m_pChainFrom, m_pChainFrom = nullptr;
+        m_pChainFrom.reset();
     }
 
     if ( bDelTo )
     {
-        delete m_pChainTo, m_pChainTo = nullptr;
+        m_pChainTo.reset();
     }
 }
 
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 8cfc54c39a0b..eb1132383b19 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -608,24 +608,18 @@ sal_uInt16 SwFEShell::GetCurOutColNum( SwGetCurColNumPara* pPara ) const
 
 SwFEShell::SwFEShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption *pOptions )
     : SwEditShell( rDoc, pWindow, pOptions )
-    , m_pChainFrom(nullptr)
-    , m_pChainTo(nullptr)
     , m_bCheckForOLEInCaption(false)
 {
 }
 
 SwFEShell::SwFEShell( SwEditShell& rShell, vcl::Window *pWindow )
     : SwEditShell( rShell, pWindow )
-    , m_pChainFrom(nullptr)
-    , m_pChainTo(nullptr)
     , m_bCheckForOLEInCaption(false)
 {
 }
 
 SwFEShell::~SwFEShell()
 {
-    delete m_pChainFrom;
-    delete m_pChainTo;
 }
 
 // #i17567# - adjustments for allowing