summaryrefslogtreecommitdiff
path: root/sc/source/ui/undo
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/undo')
-rw-r--r--sc/source/ui/undo/undoblk.cxx48
-rw-r--r--sc/source/ui/undo/undoblk2.cxx4
-rw-r--r--sc/source/ui/undo/undodat.cxx44
3 files changed, 48 insertions, 48 deletions
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index df97db382da3..480c04d8e2ea 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -799,10 +799,10 @@ bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell,
ScRange aRange, const ScAddress& aOldEnd, const ScMarkData& rMark,
- ScDocument* pNewUndoDoc ) :
+ ScDocumentUniquePtr pNewUndoDoc ) :
ScBlockUndo( pNewDocShell, ScRange(aRange.aStart, aOldEnd), SC_UNDO_AUTOHEIGHT ),
aMarkData( rMark ),
- pUndoDoc( pNewUndoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
aExtendedRange( aRange )
{
SetChangeTrack();
@@ -899,14 +899,14 @@ bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, const ScRangeList& rRanges,
const ScMarkData& rMark,
- ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc,
+ ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr pNewRedoDoc,
InsertDeleteFlags nNewFlags,
ScRefUndoData* pRefData,
bool bRedoIsFilled, const ScUndoPasteOptions* pOptions ) :
ScMultiBlockUndo( pNewDocShell, rRanges ),
aMarkData( rMark ),
- pUndoDoc( pNewUndoDoc ),
- pRedoDoc( pNewRedoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
+ pRedoDoc( std::move(pNewRedoDoc) ),
nFlags( nNewFlags ),
pRefUndoData( pRefData ),
pRefRedoData( nullptr ),
@@ -1506,10 +1506,10 @@ bool ScUndoDragDrop::CanRepeat(SfxRepeatTarget& /* rTarget */) const
// Insert list containing range names
// (Insert|Name|Insert =>[List])
ScUndoListNames::ScUndoListNames(ScDocShell* pNewDocShell, const ScRange& rRange,
- ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc)
+ ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr pNewRedoDoc)
: ScBlockUndo(pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT)
- , xUndoDoc(pNewUndoDoc)
- , xRedoDoc(pNewRedoDoc)
+ , xUndoDoc(std::move(pNewUndoDoc))
+ , xRedoDoc(std::move(pNewRedoDoc))
{
}
@@ -1557,10 +1557,10 @@ bool ScUndoListNames::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoConditionalFormat::ScUndoConditionalFormat(ScDocShell* pNewDocShell,
- ScDocument* pUndoDoc, ScDocument* pRedoDoc, const ScRange& rRange):
+ ScDocumentUniquePtr pUndoDoc, ScDocumentUniquePtr pRedoDoc, const ScRange& rRange):
ScSimpleUndo( pNewDocShell ),
- mpUndoDoc(pUndoDoc),
- mpRedoDoc(pRedoDoc),
+ mpUndoDoc(std::move(pUndoDoc)),
+ mpRedoDoc(std::move(pRedoDoc)),
maRange(rRange)
{
}
@@ -1607,10 +1607,10 @@ bool ScUndoConditionalFormat::CanRepeat(SfxRepeatTarget& ) const
}
ScUndoConditionalFormatList::ScUndoConditionalFormatList(ScDocShell* pNewDocShell,
- ScDocument* pUndoDoc, ScDocument* pRedoDoc, SCTAB nTab):
+ ScDocumentUniquePtr pUndoDoc, ScDocumentUniquePtr pRedoDoc, SCTAB nTab):
ScSimpleUndo( pNewDocShell ),
- mpUndoDoc(pUndoDoc),
- mpRedoDoc(pRedoDoc),
+ mpUndoDoc(std::move(pUndoDoc)),
+ mpRedoDoc(std::move(pRedoDoc)),
mnTab(nTab)
{
}
@@ -1669,10 +1669,10 @@ bool ScUndoConditionalFormatList::CanRepeat(SfxRepeatTarget& ) const
ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
/*C*/ const ScArea& rDestArea,
- ScDocument* pNewUndoDoc,
+ ScDocumentUniquePtr pNewUndoDoc,
const OUString& rNewName ) :
ScSimpleUndo( pNewDocShell ),
- pUndoDoc( pNewUndoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
aMarkData( rMark ),
aName( rNewName )
{
@@ -1789,10 +1789,10 @@ ScUndoSelectionStyle::ScUndoSelectionStyle( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
const ScRange& rRange,
const OUString& rName,
- ScDocument* pNewUndoDoc ) :
+ ScDocumentUniquePtr pNewUndoDoc ) :
ScSimpleUndo( pNewDocShell ),
aMarkData( rMark ),
- pUndoDoc( pNewUndoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
aStyleName( rName ),
aRange( rRange )
{
@@ -1890,9 +1890,9 @@ bool ScUndoSelectionStyle::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoEnterMatrix::ScUndoEnterMatrix( ScDocShell* pNewDocShell, const ScRange& rArea,
- ScDocument* pNewUndoDoc, const OUString& rForm ) :
+ ScDocumentUniquePtr pNewUndoDoc, const OUString& rForm ) :
ScBlockUndo( pNewDocShell, rArea, SC_UNDO_SIMPLE ),
- pUndoDoc( pNewUndoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
aFormula( rForm )
{
SetChangeTrack();
@@ -1983,10 +1983,10 @@ static ScRange lcl_GetMultiMarkRange( const ScMarkData& rMark )
}
ScUndoIndent::ScUndoIndent( ScDocShell* pNewDocShell, const ScMarkData& rMark,
- ScDocument* pNewUndoDoc, bool bIncrement ) :
+ ScDocumentUniquePtr pNewUndoDoc, bool bIncrement ) :
ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
aMarkData( rMark ),
- pUndoDoc( pNewUndoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
bIsIncrement( bIncrement )
{
}
@@ -2039,10 +2039,10 @@ bool ScUndoIndent::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoTransliterate::ScUndoTransliterate( ScDocShell* pNewDocShell, const ScMarkData& rMark,
- ScDocument* pNewUndoDoc, TransliterationFlags nType ) :
+ ScDocumentUniquePtr pNewUndoDoc, TransliterationFlags nType ) :
ScBlockUndo( pNewDocShell, lcl_GetMultiMarkRange(rMark), SC_UNDO_AUTOHEIGHT ),
aMarkData( rMark ),
- pUndoDoc( pNewUndoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
nTransliterationType( nType )
{
}
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 78a6d898a8c3..24f1ee9a24c0 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -38,7 +38,7 @@
ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
const ScMarkData& rMark,
SCCOLROW nNewStart, SCTAB nNewStartTab, SCCOLROW nNewEnd, SCTAB nNewEndTab,
- ScDocument* pNewUndoDoc, const std::vector<sc::ColRowSpan>& rRanges,
+ ScDocumentUniquePtr pNewUndoDoc, const std::vector<sc::ColRowSpan>& rRanges,
std::unique_ptr<ScOutlineTable> pNewUndoTab,
ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips, bool bNewWidth ) :
ScSimpleUndo( pNewDocShell ),
@@ -47,7 +47,7 @@ ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
nEnd( nNewEnd ),
nStartTab( nNewStartTab ),
nEndTab( nNewEndTab ),
- pUndoDoc( pNewUndoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
pUndoTab( std::move(pNewUndoTab) ),
maRanges(rRanges),
nNewSize( nNewSizeTwips ),
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 5bd7e6adf551..d0dec03b7fd8 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -52,13 +52,13 @@
ScUndoDoOutline::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 ) :
ScSimpleUndo( pNewDocShell ),
nStart( nNewStart ),
nEnd( nNewEnd ),
nTab( nNewTab ),
- pUndoDoc( pNewUndoDoc ),
+ pUndoDoc( std::move(pNewUndoDoc) ),
bColumns( bNewColumns ),
nLevel( nNewLevel ),
nEntry( nNewEntry ),
@@ -226,13 +226,13 @@ bool ScUndoMakeOutline::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoOutlineLevel::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 )
: ScSimpleUndo(pNewDocShell)
, nStart(nNewStart)
, nEnd(nNewEnd)
, nTab(nNewTab)
- , xUndoDoc(pNewUndoDoc)
+ , xUndoDoc(std::move(pNewUndoDoc))
, xUndoTable(std::move(pNewUndoTab))
, bColumns(bNewColumns)
, nLevel(nNewLevel)
@@ -308,11 +308,11 @@ bool ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoOutlineBlock::ScUndoOutlineBlock( ScDocShell* pNewDocShell,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
- ScDocument* pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab, bool bNewShow ) :
+ ScDocumentUniquePtr pNewUndoDoc, std::unique_ptr<ScOutlineTable> pNewUndoTab, bool bNewShow ) :
ScSimpleUndo( pNewDocShell ),
aBlockStart( nStartX, nStartY, nStartZ ),
aBlockEnd( nEndX, nEndY, nEndZ ),
- xUndoDoc(pNewUndoDoc),
+ xUndoDoc(std::move(pNewUndoDoc)),
xUndoTable(std::move(pNewUndoTab)),
bShow( bNewShow )
{
@@ -408,11 +408,11 @@ bool ScUndoOutlineBlock::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoRemoveAllOutlines::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)
: ScSimpleUndo(pNewDocShell)
, aBlockStart(nStartX, nStartY, nStartZ)
, aBlockEnd(nEndX, nEndY, nEndZ)
- , xUndoDoc(pNewUndoDoc)
+ , xUndoDoc(std::move(pNewUndoDoc))
, xUndoTable(std::move(pNewUndoTab))
{
}
@@ -489,11 +489,11 @@ bool ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoAutoOutline::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)
: ScSimpleUndo(pNewDocShell)
, aBlockStart(nStartX, nStartY, nStartZ)
, aBlockEnd(nEndX, nEndY, nEndZ)
- , xUndoDoc(pNewUndoDoc)
+ , xUndoDoc(std::move(pNewUndoDoc))
, xUndoTable(std::move(pNewUndoTab))
{
}
@@ -585,14 +585,14 @@ bool ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoSubTotals::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)
: ScDBFuncUndo(pNewDocShell, ScRange(rNewParam.nCol1, rNewParam.nRow1, nNewTab,
rNewParam.nCol2, rNewParam.nRow2, nNewTab))
, nTab(nNewTab)
, aParam(rNewParam)
, nNewEndRow(nNewEndY)
- , xUndoDoc(pNewUndoDoc)
+ , xUndoDoc(std::move(pNewUndoDoc))
, xUndoTable(std::move(pNewUndoTab))
, xUndoRange(pNewUndoRange)
, xUndoDB(pNewUndoDB)
@@ -698,14 +698,14 @@ bool ScUndoSubTotals::CanRepeat(SfxRepeatTarget& /* rTarget */) const
}
ScUndoQuery::ScUndoQuery( ScDocShell* pNewDocShell, SCTAB nNewTab, const ScQueryParam& rParam,
- ScDocument* pNewUndoDoc, ScDBCollection* pNewUndoDB,
+ ScDocumentUniquePtr pNewUndoDoc, ScDBCollection* pNewUndoDB,
const ScRange* pOld, bool bSize, const ScRange* pAdvSrc ) :
ScDBFuncUndo( pNewDocShell, ScRange( rParam.nCol1, rParam.nRow1, nNewTab,
rParam.nCol2, rParam.nRow2, nNewTab ) ),
pDrawUndo( nullptr ),
nTab( nNewTab ),
aQueryParam( rParam ),
- xUndoDoc( pNewUndoDoc ),
+ xUndoDoc( std::move(pNewUndoDoc) ),
xUndoDB( pNewUndoDB ),
bIsAdvanced( false ),
bDestArea( false ),
@@ -1019,15 +1019,15 @@ bool ScUndoDBData::CanRepeat(SfxRepeatTarget& /* rTarget */) const
ScUndoImportData::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 ) :
ScSimpleUndo( pNewDocShell ),
nTab( nNewTab ),
aImportParam( rParam ),
nEndCol( nNewEndX ),
nEndRow( nNewEndY ),
- xUndoDoc(pNewUndoDoc),
- xRedoDoc(pNewRedoDoc),
+ xUndoDoc(std::move(pNewUndoDoc)),
+ xRedoDoc(std::move(pNewRedoDoc)),
xUndoDBData(pNewUndoData),
xRedoDBData(pNewRedoData),
nFormulaCols( nNewFormula ),
@@ -1223,7 +1223,7 @@ bool ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoRepeatDB::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 ) :
ScSimpleUndo( pNewDocShell ),
@@ -1231,7 +1231,7 @@ ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab,
aBlockEnd( nEndX,nEndY,nNewTab ),
nNewEndRow( nResultEndRow ),
aCursorPos( nCurX,nCurY,nNewTab ),
- xUndoDoc(pNewUndoDoc),
+ xUndoDoc(std::move(pNewUndoDoc)),
xUndoTable(pNewUndoTab),
xUndoRange(pNewUndoRange),
xUndoDB(pNewUndoDB),
@@ -1379,11 +1379,11 @@ bool ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoDataPilot::ScUndoDataPilot( ScDocShell* pNewDocShell,
- ScDocument* pOldDoc, ScDocument* pNewDoc,
+ ScDocumentUniquePtr pOldDoc, ScDocumentUniquePtr pNewDoc,
const ScDPObject* pOldObj, const ScDPObject* pNewObj, bool bMove )
: ScSimpleUndo(pNewDocShell)
- , xOldUndoDoc(pOldDoc)
- , xNewUndoDoc(pNewDoc)
+ , xOldUndoDoc(std::move(pOldDoc))
+ , xNewUndoDoc(std::move(pNewDoc))
, bAllowMove( bMove)
{
if (pOldObj)
generated by cgit (git 2.34.1) at 2025-05-14 02:30:22 +0000