1 files changed, 26 insertions, 26 deletions

diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index a59a0ae265ac..fd531de17a8b 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -99,26 +99,26 @@ private:
     sal_uInt16              nDrawSfxId;
     sal_uInt16              nFormSfxId;
     OUString                sDrawCustom;                // current custom shape type
-    ScDrawShell*            pDrawShell;
-    ScDrawTextObjectBar*    pDrawTextShell;
-    ScEditShell*            pEditShell;
-    ScPivotShell*           pPivotShell;
-    ScAuditingShell*        pAuditingShell;
-    ScDrawFormShell*        pDrawFormShell;
-    ScCellShell*            pCellShell;
-    ScOleObjectShell*       pOleObjectShell;
-    ScChartShell*           pChartShell;
-    ScGraphicShell*         pGraphicShell;
-    ScMediaShell*           pMediaShell;
-    ScPageBreakShell*       pPageBreakShell;
-    svx::ExtrusionBar*      pExtrusionBarShell;
-    svx::FontworkBar*       pFontworkBarShell;
-
-    FmFormShell*            pFormShell;
+    std::unique_ptr<ScDrawShell>         pDrawShell;
+    std::unique_ptr<ScDrawTextObjectBar> pDrawTextShell;
+    std::unique_ptr<ScEditShell>         pEditShell;
+    std::unique_ptr<ScPivotShell>        pPivotShell;
+    std::unique_ptr<ScAuditingShell>     pAuditingShell;
+    std::unique_ptr<ScDrawFormShell>     pDrawFormShell;
+    std::unique_ptr<ScCellShell>         pCellShell;
+    std::unique_ptr<ScOleObjectShell>    pOleObjectShell;
+    std::unique_ptr<ScChartShell>        pChartShell;
+    std::unique_ptr<ScGraphicShell>      pGraphicShell;
+    std::unique_ptr<ScMediaShell>        pMediaShell;
+    std::unique_ptr<ScPageBreakShell>    pPageBreakShell;
+    std::unique_ptr<svx::ExtrusionBar>   pExtrusionBarShell;
+    std::unique_ptr<svx::FontworkBar>    pFontworkBarShell;
+
+    std::unique_ptr<FmFormShell> pFormShell;
 
     std::unique_ptr<ScInputHandler, o3tl::default_delete<ScInputHandler>> mpInputHandler;              // for OLE input cell
 
-    ::editeng::SvxBorderLine*           pCurFrameLine;
+    std::unique_ptr<::editeng::SvxBorderLine> pCurFrameLine;
 
     css::uno::Reference< css::frame::XDispatchProviderInterceptor >
                             xDisProvInterceptor;
@@ -126,10 +126,10 @@ private:
     Point                   aWinPos;
 
     ScTabViewTarget         aTarget;
-    ScArea*                 pPivotSource;
-    ScDPObject*             pDialogDPObject;
+    std::unique_ptr<ScArea>     pPivotSource;
+    std::unique_ptr<ScDPObject> pDialogDPObject;
 
-    ScNavigatorSettings*    pNavSettings;
+    std::unique_ptr<ScNavigatorSettings> pNavSettings;
 
     // used in first Activate
     bool                    bFirstActivate;
@@ -159,7 +159,7 @@ private:
 
     sal_uInt16              nCurRefDlgId;
 
-    SfxBroadcaster*         pAccessibilityBroadcaster;
+    std::unique_ptr<SfxBroadcaster> pAccessibilityBroadcaster;
 
     // ugly hack for Add button in ScNameDlg
     std::map<OUString, std::unique_ptr<ScRangeName>> m_RangeMap;
@@ -240,7 +240,7 @@ public:
 
     void            SetActive();
 
-    ::editeng::SvxBorderLine*   GetDefaultFrameLine() const { return pCurFrameLine; }
+    ::editeng::SvxBorderLine*   GetDefaultFrameLine() const { return pCurFrameLine.get(); }
     void            SetDefaultFrameLine(const ::editeng::SvxBorderLine* pLine );
 
     void           Execute( SfxRequest& rReq );
@@ -279,8 +279,8 @@ public:
     void            SetDrawTextShell( bool bActive );
 
     void            SetPivotShell( bool bActive );
-    void            SetDialogDPObject( const ScDPObject* pObj );
-    const ScDPObject* GetDialogDPObject() const { return pDialogDPObject; }
+    void            SetDialogDPObject( std::unique_ptr<ScDPObject> pObj );
+    const ScDPObject* GetDialogDPObject() const { return pDialogDPObject.get(); }
 
     void            SetDontSwitch(bool bFlag){bDontSwitch=bFlag;}
 
@@ -333,8 +333,8 @@ public:
 
     void            UpdateOleZoom();
 
-    virtual const FmFormShell* GetFormShell() const override { return pFormShell; }
-    virtual       FmFormShell* GetFormShell()       override { return pFormShell; }
+    virtual const FmFormShell* GetFormShell() const override { return pFormShell.get(); }
+    virtual       FmFormShell* GetFormShell()       override { return pFormShell.get(); }
 
     void    InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget,
                             sal_uInt16 nMode );