use std::unique_ptr

Change-Id: I11a58aa38f931c7912e2e5ac6df46f98e6bb681e
Reviewed-on: https://gerrit.libreoffice.org/34539
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

3 files changed, 115 insertions, 133 deletions

diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 6dd755ff153a..4be768e47de1 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -439,7 +439,7 @@ public:
 private:
     ScCellMergeOption maOption;
     bool            mbMergeContents;        // Merge contents in Redo().
-    ScDocument*     mpUndoDoc;              // when data is merged
+    std::unique_ptr<ScDocument> mxUndoDoc;              // when data is merged
     SdrUndoAction*  mpDrawUndo;
 
     void            DoChange( bool bUndo ) const;
@@ -592,10 +592,9 @@ private:
 class ScUndoListNames: public ScBlockUndo
 {
 public:
-                    ScUndoListNames( ScDocShell* pNewDocShell,
-                                     const ScRange& rRange,
-                                     ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc );
-    virtual         ~ScUndoListNames() override;
+    ScUndoListNames(ScDocShell* pNewDocShell,
+                    const ScRange& rRange,
+                    ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -605,8 +604,8 @@ public:
     virtual OUString GetComment() const override;
 
 private:
-    ScDocument*     pUndoDoc;
-    ScDocument*     pRedoDoc;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScDocument> xRedoDoc;
 
     void            DoChange( ScDocument* pSrcDoc ) const;
 };
@@ -687,9 +686,8 @@ private:
 class ScUndoRefreshLink: public ScSimpleUndo
 {
 public:
-                    ScUndoRefreshLink( ScDocShell* pNewDocShell,
-                                       ScDocument* pNewUndoDoc );
-    virtual         ~ScUndoRefreshLink() override;
+    ScUndoRefreshLink(ScDocShell* pNewDocShell,
+                      ScDocument* pNewUndoDoc);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -699,8 +697,8 @@ public:
     virtual OUString GetComment() const override;
 
 private:
-    ScDocument*     pUndoDoc;
-    ScDocument*     pRedoDoc;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScDocument> xRedoDoc;
 };
 
 class ScUndoEnterMatrix: public ScBlockUndo
@@ -784,18 +782,17 @@ private:
 class ScUndoUpdateAreaLink : public ScSimpleUndo        //! also change BlockUndo?
 {
 public:
-                    ScUndoUpdateAreaLink( ScDocShell* pShell,
-                                          const OUString& rOldD,
-                                          const OUString& rOldF, const OUString& rOldO,
-                                          const OUString& rOldA, const ScRange& rOldR,
-                                          sal_uLong nOldRD,
-                                          const OUString& rNewD,
-                                          const OUString& rNewF, const OUString& rNewO,
-                                          const OUString& rNewA, const ScRange& rNewR,
-                                          sal_uLong nNewRD,
-                                          ScDocument* pUndo, ScDocument* pRedo,
-                                          bool bDoInsert );
-    virtual         ~ScUndoUpdateAreaLink() override;
+    ScUndoUpdateAreaLink(ScDocShell* pShell,
+                         const OUString& rOldD,
+                         const OUString& rOldF, const OUString& rOldO,
+                         const OUString& rOldA, const ScRange& rOldR,
+                         sal_uLong nOldRD,
+                         const OUString& rNewD,
+                         const OUString& rNewF, const OUString& rNewO,
+                         const OUString& rNewA, const ScRange& rNewR,
+                         sal_uLong nNewRD,
+                         ScDocument* pUndo, ScDocument* pRedo,
+                         bool bDoInsert);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -815,8 +812,8 @@ private:
     OUString        aNewOpt;
     OUString        aNewArea;
     ScRange         aNewRange;
-    ScDocument*     pUndoDoc;
-    ScDocument*     pRedoDoc;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScDocument> xRedoDoc;
     sal_uLong       nOldRefresh;
     sal_uLong       nNewRefresh;
     bool            bWithInsert;
@@ -937,12 +934,11 @@ private:
 class ScUndoBorder: public ScBlockUndo
 {
 public:
-                    ScUndoBorder( ScDocShell* pNewDocShell,
-                                    const ScRangeList& rRangeList,
-                                    ScDocument* pNewUndoDoc,
-                                    const SvxBoxItem& rNewOuter,
-                                    const SvxBoxInfoItem& rNewInner );
-    virtual         ~ScUndoBorder() override;
+    ScUndoBorder(ScDocShell* pNewDocShell,
+                 const ScRangeList& rRangeList,
+                 ScDocument* pNewUndoDoc,
+                 const SvxBoxItem& rNewOuter,
+                 const SvxBoxInfoItem& rNewInner);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -952,10 +948,10 @@ public:
     virtual OUString GetComment() const override;
 
 private:
-    ScDocument*     pUndoDoc;
-    ScRangeList*    pRanges;
-    SvxBoxItem*     pOuter;
-    SvxBoxInfoItem* pInner;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScRangeList> xRanges;
+    std::unique_ptr<SvxBoxItem> xOuter;
+    std::unique_ptr<SvxBoxInfoItem> xInner;
 };
 
 #endif
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index ae55159602ff..fdb6f3c27504 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -97,11 +97,10 @@ private:
 class ScUndoOutlineLevel: public ScSimpleUndo
 {
 public:
-                    ScUndoOutlineLevel( ScDocShell* pNewDocShell,
-                            SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
-                            ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
-                            bool bNewColumns, sal_uInt16 nNewLevel );
-    virtual         ~ScUndoOutlineLevel() override;
+    ScUndoOutlineLevel(ScDocShell* pNewDocShell,
+                       SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab,
+                       ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
+                       bool bNewColumns, sal_uInt16 nNewLevel);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -114,8 +113,8 @@ private:
     SCCOLROW        nStart;
     SCCOLROW        nEnd;
     SCTAB           nTab;
-    ScDocument*     pUndoDoc;
-    ScOutlineTable* pUndoTable;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScOutlineTable> xUndoTable;
     bool            bColumns;
     sal_uInt16      nLevel;
 };
@@ -123,12 +122,11 @@ private:
 class ScUndoOutlineBlock: public ScSimpleUndo
 {
 public:
-                    ScUndoOutlineBlock( ScDocShell* pNewDocShell,
-                            SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
-                            SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                            ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
-                            bool bNewShow );
-    virtual         ~ScUndoOutlineBlock() override;
+    ScUndoOutlineBlock(ScDocShell* pNewDocShell,
+                       SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
+                       SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
+                       ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
+                       bool bNewShow);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -140,19 +138,18 @@ public:
 private:
     ScAddress       aBlockStart;
     ScAddress       aBlockEnd;
-    ScDocument*     pUndoDoc;
-    ScOutlineTable* pUndoTable;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScOutlineTable> xUndoTable;
     bool            bShow;
 };
 
 class ScUndoRemoveAllOutlines: public ScSimpleUndo
 {
 public:
-                    ScUndoRemoveAllOutlines( ScDocShell* pNewDocShell,
-                            SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
-                            SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                            ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab );
-    virtual         ~ScUndoRemoveAllOutlines() override;
+    ScUndoRemoveAllOutlines(ScDocShell* pNewDocShell,
+            SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
+            SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
+            ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -164,18 +161,17 @@ public:
 private:
     ScAddress       aBlockStart;
     ScAddress       aBlockEnd;
-    ScDocument*     pUndoDoc;
-    ScOutlineTable* pUndoTable;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScOutlineTable> xUndoTable;
 };
 
 class ScUndoAutoOutline: public ScSimpleUndo
 {
 public:
-                    ScUndoAutoOutline( ScDocShell* pNewDocShell,
-                            SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
-                            SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                            ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab );
-    virtual         ~ScUndoAutoOutline() override;
+    ScUndoAutoOutline(ScDocShell* pNewDocShell,
+                      SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
+                      SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
+                      ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -187,19 +183,17 @@ public:
 private:
     ScAddress       aBlockStart;
     ScAddress       aBlockEnd;
-    ScDocument*     pUndoDoc;
-    ScOutlineTable* pUndoTable;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScOutlineTable> xUndoTable;
 };
 
 class ScUndoSubTotals: public ScDBFuncUndo
 {
 public:
-                    ScUndoSubTotals( ScDocShell* pNewDocShell, SCTAB nNewTab,
-                            const ScSubTotalParam& rNewParam, SCROW nNewEndY,
-                            ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
-//                          ScDBData* pNewData,
-                            ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB );
-    virtual         ~ScUndoSubTotals() override;
+    ScUndoSubTotals(ScDocShell* pNewDocShell, SCTAB nNewTab,
+                    const ScSubTotalParam& rNewParam, SCROW nNewEndY,
+                    ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
+                    ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -212,11 +206,10 @@ private:
     SCTAB           nTab;
     ScSubTotalParam aParam;                         // The original passed parameter
     SCROW           nNewEndRow;                     // Size of result
-    ScDocument*     pUndoDoc;
-    ScOutlineTable* pUndoTable;
-//  ScDBData*       pUndoDBData;
-    ScRangeName*    pUndoRange;
-    ScDBCollection* pUndoDB;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScOutlineTable> xUndoTable;
+    std::unique_ptr<ScRangeName> xUndoRange;
+    std::unique_ptr<ScDBCollection> xUndoDB;
 };
 
 class ScUndoQuery: public ScDBFuncUndo
@@ -239,8 +232,8 @@ private:
     SdrUndoAction*  pDrawUndo;
     SCTAB           nTab;
     ScQueryParam    aQueryParam;
-    ScDocument*     pUndoDoc;
-    ScDBCollection* pUndoDB;                // due to source and target range
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScDBCollection> xUndoDB;                // due to source and target range
     ScRange         aOldDest;
     ScRange         aAdvSource;
     bool            bIsAdvanced;
@@ -291,12 +284,11 @@ private:
 class ScUndoImportData: public ScSimpleUndo
 {
 public:
-                    ScUndoImportData( ScDocShell* pNewDocShell, SCTAB nNewTab,
-                            const ScImportParam& rParam, SCCOL nNewEndX, SCROW nNewEndY,
-                            SCCOL nNewFormula,
-                            ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                            ScDBData* pNewUndoData, ScDBData* pNewRedoData );
-    virtual         ~ScUndoImportData() override;
+    ScUndoImportData(ScDocShell* pNewDocShell, SCTAB nNewTab,
+                     const ScImportParam& rParam, SCCOL nNewEndX, SCROW nNewEndY,
+                     SCCOL nNewFormula,
+                     ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
+                     ScDBData* pNewUndoData, ScDBData* pNewRedoData);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -310,10 +302,10 @@ private:
     ScImportParam   aImportParam;
     SCCOL           nEndCol;
     SCROW           nEndRow;
-    ScDocument*     pUndoDoc;
-    ScDocument*     pRedoDoc;
-    ScDBData*       pUndoDBData;
-    ScDBData*       pRedoDBData;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScDocument> xRedoDoc;
+    std::unique_ptr<ScDBData> xUndoDBData;
+    std::unique_ptr<ScDBData> xRedoDBData;
     SCCOL           nFormulaCols;
     bool            bRedoFilled;
 };
@@ -321,13 +313,12 @@ private:
 class ScUndoRepeatDB: public ScSimpleUndo
 {
 public:
-                    ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab,
-                            SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY,
-                            SCROW nResultEndRow, SCCOL nCurX, SCROW nCurY,
-                            ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
-                            ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB,
-                            const ScRange* pOldQ, const ScRange* pNewQ );
-    virtual         ~ScUndoRepeatDB() override;
+    ScUndoRepeatDB(ScDocShell* pNewDocShell, SCTAB nNewTab,
+                   SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY,
+                   SCROW nResultEndRow, SCCOL nCurX, SCROW nCurY,
+                   ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab,
+                   ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB,
+                   const ScRange* pOldQ, const ScRange* pNewQ);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -341,10 +332,10 @@ private:
     ScAddress       aBlockEnd;
     SCROW           nNewEndRow;
     ScAddress       aCursorPos;
-    ScDocument*     pUndoDoc;
-    ScOutlineTable* pUndoTable;
-    ScRangeName*    pUndoRange;
-    ScDBCollection* pUndoDB;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScOutlineTable> xUndoTable;
+    std::unique_ptr<ScRangeName> xUndoRange;
+    std::unique_ptr<ScDBCollection> xUndoDB;
     ScRange         aOldQuery;
     ScRange         aNewQuery;
     bool            bQuerySize;
@@ -353,11 +344,10 @@ private:
 class ScUndoDataPilot: public ScSimpleUndo
 {
 public:
-                    ScUndoDataPilot( ScDocShell* pNewDocShell,
-                            ScDocument* pOldDoc, ScDocument* pNewDoc,
-                            const ScDPObject* pOldObj, const ScDPObject* pNewObj,
-                            bool bMove );
-    virtual         ~ScUndoDataPilot() override;
+    ScUndoDataPilot(ScDocShell* pNewDocShell,
+                    ScDocument* pOldDoc, ScDocument* pNewDoc,
+                    const ScDPObject* pOldObj, const ScDPObject* pNewObj,
+                    bool bMove);
 
     virtual void    Undo() override;
     virtual void    Redo() override;
@@ -367,22 +357,21 @@ public:
     virtual OUString GetComment() const override;
 
 private:
-    ScDocument*     pOldUndoDoc;
-    ScDocument*     pNewUndoDoc;
-    ScDPObject*     pOldDPObject;
-    ScDPObject*     pNewDPObject;
+    std::unique_ptr<ScDocument> xOldUndoDoc;
+    std::unique_ptr<ScDocument> xNewUndoDoc;
+    std::unique_ptr<ScDPObject> xOldDPObject;
+    std::unique_ptr<ScDPObject> xNewDPObject;
     bool            bAllowMove;
 };
 
 class ScUndoConsolidate: public ScSimpleUndo
 {
 public:
-                        ScUndoConsolidate( ScDocShell* pNewDocShell,
-                                const ScArea& rArea, const ScConsolidateParam& rPar,
-                                ScDocument* pNewUndoDoc, bool bReference,
-                                SCROW nInsCount, ScOutlineTable* pTab,
-                                ScDBData* pData );
-    virtual             ~ScUndoConsolidate() override;
+    ScUndoConsolidate(ScDocShell* pNewDocShell,
+                      const ScArea& rArea, const ScConsolidateParam& rPar,
+                      ScDocument* pNewUndoDoc, bool bReference,
+                      SCROW nInsCount, ScOutlineTable* pTab,
+                      ScDBData* pData);
 
     virtual void        Undo() override;
     virtual void        Redo() override;
@@ -393,12 +382,12 @@ public:
 
 private:
     ScArea              aDestArea;
-    ScDocument*         pUndoDoc;
+    std::unique_ptr<ScDocument> xUndoDoc;
     ScConsolidateParam  aParam;
     bool                bInsRef;
     SCSIZE              nInsertCount;
-    ScOutlineTable*     pUndoTab;
-    ScDBData*           pUndoData;
+    std::unique_ptr<ScOutlineTable> xUndoTab;
+    std::unique_ptr<ScDBData> xUndoData;
 };
 
 class ScUndoChartData: public ScSimpleUndo
@@ -436,16 +425,13 @@ private:
 class ScUndoDataForm: public ScBlockUndo
 {
 public:
-                    ScUndoDataForm( ScDocShell* pNewDocShell,
-                                SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
-                                SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
-                                const ScMarkData& rMark,
-                                ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
-                                InsertDeleteFlags nNewFlags,
-                                ScRefUndoData* pRefData
-                                 );
-    virtual     ~ScUndoDataForm() override;
-
+    ScUndoDataForm(ScDocShell* pNewDocShell,
+                   SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
+                   SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
+                   const ScMarkData& rMark,
+                   ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
+                   InsertDeleteFlags nNewFlags,
+                   ScRefUndoData* pRefData);
     virtual void    Undo() override;
     virtual void    Redo() override;
     virtual void    Repeat(SfxRepeatTarget& rTarget) override;
@@ -454,12 +440,12 @@ public:
     virtual OUString GetComment() const override;
 
 private:
-    std::unique_ptr<ScMarkData> mpMarkData;
-    ScDocument*     pUndoDoc;
-    ScDocument*     pRedoDoc;
+    std::unique_ptr<ScMarkData> mxMarkData;
+    std::unique_ptr<ScDocument> xUndoDoc;
+    std::unique_ptr<ScDocument> xRedoDoc;
     InsertDeleteFlags nFlags;
-    ScRefUndoData*  pRefUndoData;
-    ScRefUndoData*  pRefRedoData;
+    std::unique_ptr<ScRefUndoData> xRefUndoData;
+    std::unique_ptr<ScRefUndoData> xRefRedoData;
     sal_uLong       nStartChangeAction;
     sal_uLong       nEndChangeAction;
     bool            bRedoFilled;
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index 214881479dce..662dd0358c1b 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -271,7 +271,7 @@ public:
 private:
     SCTAB       nTab;
     SCTAB       nCount;
-    ScDocument* pRedoDoc;
+    std::unique_ptr<ScDocument> xRedoDoc;
     SdrUndoAction*  pDrawUndo;
 
     void DoChange() const;