diff options
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r-- | sc/source/ui/inc/undoblk.hxx | 28 | ||||
-rw-r--r-- | sc/source/ui/inc/undodat.hxx | 20 |
2 files changed, 24 insertions, 24 deletions
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index ed47fb2913ee..c0c5963c97d8 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -141,7 +141,7 @@ public: ScRange aRange, // adjusted for merged cells const ScAddress& aOldEnd, // end position without adjustment const ScMarkData& rMark, // selected sheets - ScDocument* pNewUndoDoc ); + ScDocumentUniquePtr pNewUndoDoc ); virtual ~ScUndoCut() override; virtual void Undo() override; @@ -185,7 +185,7 @@ class ScUndoPaste: public ScMultiBlockUndo public: ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges, const ScMarkData& rMark, - ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, + ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr pNewRedoDoc, InsertDeleteFlags nNewFlags, ScRefUndoData* pRefData, bool bRedoIsFilled = true, @@ -201,8 +201,8 @@ public: private: ScMarkData aMarkData; - std::unique_ptr<ScDocument> pUndoDoc; - std::unique_ptr<ScDocument> pRedoDoc; + ScDocumentUniquePtr pUndoDoc; + ScDocumentUniquePtr pRedoDoc; InsertDeleteFlags nFlags; std::unique_ptr<ScRefUndoData> pRefUndoData; std::unique_ptr<ScRefUndoData> pRefRedoData; @@ -363,7 +363,7 @@ public: const ScMarkData& rMark, SCCOLROW nNewStart, SCTAB nNewStartTab, SCCOLROW nNewEnd, SCTAB nNewEndTab, - ScDocument* pNewUndoDoc, + ScDocumentUniquePtr pNewUndoDoc, const std::vector<sc::ColRowSpan>& rRanges, std::unique_ptr<ScOutlineTable> pNewUndoTab, ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips, @@ -383,7 +383,7 @@ private: SCCOLROW nEnd; SCTAB nStartTab; SCTAB nEndTab; - std::unique_ptr<ScDocument> pUndoDoc; + ScDocumentUniquePtr pUndoDoc; std::unique_ptr<ScOutlineTable> pUndoTab; std::vector<sc::ColRowSpan> maRanges; sal_uInt16 nNewSize; @@ -599,7 +599,7 @@ class ScUndoListNames: public ScBlockUndo public: ScUndoListNames(ScDocShell* pNewDocShell, const ScRange& rRange, - ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc); + ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr pNewRedoDoc); virtual void Undo() override; virtual void Redo() override; @@ -619,7 +619,7 @@ class ScUndoConditionalFormat : public ScSimpleUndo { public: ScUndoConditionalFormat( ScDocShell* pNewDocShell, - ScDocument* pUndoDoc, ScDocument* pRedoDoc, const ScRange& rRange); + ScDocumentUniquePtr pUndoDoc, ScDocumentUniquePtr pRedoDoc, const ScRange& rRange); virtual ~ScUndoConditionalFormat() override; virtual void Undo() override; @@ -640,7 +640,7 @@ class ScUndoConditionalFormatList : public ScSimpleUndo { public: ScUndoConditionalFormatList( ScDocShell* pNewDocShell, - ScDocument* pUndoDoc, ScDocument* pRedoDoc, SCTAB nTab); + ScDocumentUniquePtr pUndoDoc, ScDocumentUniquePtr pRedoDoc, SCTAB nTab); virtual ~ScUndoConditionalFormatList() override; virtual void Undo() override; @@ -662,7 +662,7 @@ class ScUndoUseScenario: public ScSimpleUndo public: ScUndoUseScenario( ScDocShell* pNewDocShell, const ScMarkData& rMark, - const ScArea& rDestArea, ScDocument* pNewUndoDoc, + const ScArea& rDestArea, ScDocumentUniquePtr pNewUndoDoc, const OUString& rNewName ); virtual ~ScUndoUseScenario() override; @@ -688,7 +688,7 @@ public: const ScMarkData& rMark, const ScRange& rRange, const OUString& rName, - ScDocument* pNewUndoDoc ); + ScDocumentUniquePtr pNewUndoDoc ); virtual ~ScUndoSelectionStyle() override; virtual void Undo() override; @@ -731,7 +731,7 @@ class ScUndoEnterMatrix: public ScBlockUndo public: ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea, - ScDocument* pNewUndoDoc, + ScDocumentUniquePtr pNewUndoDoc, const OUString& rForm ); virtual ~ScUndoEnterMatrix() override; @@ -850,7 +850,7 @@ class ScUndoIndent: public ScBlockUndo { public: ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark, - ScDocument* pNewUndoDoc, bool bIncrement ); + ScDocumentUniquePtr pNewUndoDoc, bool bIncrement ); virtual ~ScUndoIndent() override; virtual void Undo() override; @@ -871,7 +871,7 @@ class ScUndoTransliterate: public ScBlockUndo { public: ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark, - ScDocument* pNewUndoDoc, TransliterationFlags nType ); + ScDocumentUniquePtr pNewUndoDoc, TransliterationFlags nType ); virtual ~ScUndoTransliterate() override; virtual void Undo() override; diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index b9155ddbeb8a..77d51e356825 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -45,7 +45,7 @@ class ScUndoDoOutline: public ScSimpleUndo public: ScUndoDoOutline( ScDocShell* pNewDocShell, SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, - ScDocument* pNewUndoDoc, bool bNewColumns, + ScDocumentUniquePtr pNewUndoDoc, bool bNewColumns, sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, bool bNewShow ); virtual ~ScUndoDoOutline() override; @@ -99,7 +99,7 @@ class ScUndoOutlineLevel: public ScSimpleUndo public: ScUndoOutlineLevel(ScDocShell* pNewDocShell, SCCOLROW nNewStart, SCCOLROW nNewEnd, SCTAB nNewTab, - ScDocument* pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab, + ScDocumentUniquePtr pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab, bool bNewColumns, sal_uInt16 nNewLevel); virtual void Undo() override; @@ -125,7 +125,7 @@ public: ScUndoOutlineBlock(ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, - ScDocument* pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab, + ScDocumentUniquePtr pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab, bool bNewShow); virtual void Undo() override; @@ -149,7 +149,7 @@ public: ScUndoRemoveAllOutlines(ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, - ScDocument* pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab); + ScDocumentUniquePtr pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab); virtual void Undo() override; virtual void Redo() override; @@ -171,7 +171,7 @@ public: ScUndoAutoOutline(ScDocShell* pNewDocShell, SCCOL nStartX, SCROW nStartY, SCTAB nStartZ, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, - ScDocument* pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab); + ScDocumentUniquePtr pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab); virtual void Undo() override; virtual void Redo() override; @@ -192,7 +192,7 @@ class ScUndoSubTotals: public ScDBFuncUndo public: ScUndoSubTotals(ScDocShell* pNewDocShell, SCTAB nNewTab, const ScSubTotalParam& rNewParam, SCROW nNewEndY, - ScDocument* pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab, + ScDocumentUniquePtr pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab, ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB); virtual void Undo() override; @@ -216,7 +216,7 @@ class ScUndoQuery: public ScDBFuncUndo { public: ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, - const ScQueryParam& rParam, ScDocument* pNewUndoDoc, + const ScQueryParam& rParam, ScDocumentUniquePtr pNewUndoDoc, ScDBCollection* pNewUndoDB, const ScRange* pOld, bool bSize, const ScRange* pAdvSrc ); virtual ~ScUndoQuery() override; @@ -288,7 +288,7 @@ public: ScUndoImportData(ScDocShell* pNewDocShell, SCTAB nNewTab, const ScImportParam& rParam, SCCOL nNewEndX, SCROW nNewEndY, SCCOL nNewFormula, - ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, + ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr pNewRedoDoc, ScDBData* pNewUndoData, ScDBData* pNewRedoData); virtual void Undo() override; @@ -317,7 +317,7 @@ public: ScUndoRepeatDB(ScDocShell* pNewDocShell, SCTAB nNewTab, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, SCROW nResultEndRow, SCCOL nCurX, SCROW nCurY, - ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab, + ScDocumentUniquePtr pNewUndoDoc, ScOutlineTable* pNewUndoTab, ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB, const ScRange* pOldQ, const ScRange* pNewQ); @@ -346,7 +346,7 @@ class ScUndoDataPilot: public ScSimpleUndo { public: ScUndoDataPilot(ScDocShell* pNewDocShell, - ScDocument* pOldDoc, ScDocument* pNewDoc, + ScDocumentUniquePtr pOldDoc, ScDocumentUniquePtr pNewDoc, const ScDPObject* pOldObj, const ScDPObject* pNewObj, bool bMove); |