summaryrefslogtreecommitdiff
path: root/sc/source/ui/undo/undoblk3.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/undo/undoblk3.cxx')
-rw-r--r--sc/source/ui/undo/undoblk3.cxx95
1 files changed, 48 insertions, 47 deletions
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 4aa05b5780e8..79c4c7252705 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -26,6 +26,7 @@
#include <editeng/justifyitem.hxx>
#include <svl/srchitem.hxx>
#include <sfx2/linkmgr.hxx>
+#include <utility>
#include <vcl/virdev.hxx>
#include <sfx2/app.hxx>
#include <svx/svdundo.hxx>
@@ -57,12 +58,12 @@
ScUndoDeleteContents::ScUndoDeleteContents(
ScDocShell* pNewDocShell,
- const ScMarkData& rMark, const ScRange& rRange,
+ ScMarkData aMark, const ScRange& rRange,
ScDocumentUniquePtr&& pNewUndoDoc, bool bNewMulti,
InsertDeleteFlags nNewFlags, bool bObjects )
: ScSimpleUndo( pNewDocShell ),
aRange ( rRange ),
- aMarkData ( rMark ),
+ aMarkData (std::move( aMark )),
pUndoDoc ( std::move(pNewUndoDoc) ),
nFlags ( nNewFlags ),
bMulti ( bNewMulti ) // unnecessary
@@ -203,14 +204,14 @@ bool ScUndoDeleteContents::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
- const ScMarkData& rMark,
+ ScMarkData aMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocumentUniquePtr pNewUndoDoc, bool bNewMulti, SCTAB nSrc,
InsertDeleteFlags nFlg, ScPasteFunc nFunc, bool bSkip, bool bLink )
: ScSimpleUndo( pNewDocShell ),
aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
- aMarkData ( rMark ),
+ aMarkData (std::move( aMark )),
pUndoDoc ( std::move(pNewUndoDoc) ),
nFlags ( nFlg ),
nFunction ( nFunc ),
@@ -339,7 +340,7 @@ bool ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
- const ScMarkData& rMark,
+ ScMarkData aMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocumentUniquePtr pNewUndoDoc, bool bNewMulti,
@@ -347,7 +348,7 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner,
const ScRange* pRangeCover )
: ScSimpleUndo( pNewDocShell ),
- aMarkData ( rMark ),
+ aMarkData (std::move( aMark )),
aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
mpDataArray(new ScEditDataArray),
pUndoDoc ( std::move(pNewUndoDoc) ),
@@ -482,12 +483,12 @@ bool ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell,
const ScRange& rRange, const ScRange& rSourceArea,
- ScDocumentUniquePtr pNewUndoDoc, const ScMarkData& rMark,
+ ScDocumentUniquePtr pNewUndoDoc, ScMarkData aMark,
FillDir eNewFillDir, FillCmd eNewFillCmd, FillDateCmd eNewFillDateCmd,
double fNewStartValue, double fNewStepValue, double fNewMaxValue )
: ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
aSource ( rSourceArea ),
- aMarkData ( rMark ),
+ aMarkData (std::move( aMark )),
pUndoDoc ( std::move(pNewUndoDoc) ),
eFillDir ( eNewFillDir ),
eFillCmd ( eNewFillCmd ),
@@ -634,10 +635,10 @@ bool ScUndoAutoFill::CanRepeat(SfxRepeatTarget& rTarget) const
return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr;
}
-ScUndoMerge::ScUndoMerge(ScDocShell* pNewDocShell, const ScCellMergeOption& rOption,
+ScUndoMerge::ScUndoMerge(ScDocShell* pNewDocShell, ScCellMergeOption aOption,
bool bMergeContents, ScDocumentUniquePtr pUndoDoc, std::unique_ptr<SdrUndoAction> pDrawUndo)
: ScSimpleUndo(pNewDocShell)
- , maOption(rOption)
+ , maOption(std::move(aOption))
, mbMergeContents(bMergeContents)
, mxUndoDoc(std::move(pUndoDoc))
, mpDrawUndo(std::move(pDrawUndo))
@@ -766,10 +767,10 @@ bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget) const
ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
const ScRange& rRange, ScDocumentUniquePtr pNewUndoDoc,
- const ScMarkData& rMark, bool bNewSize, sal_uInt16 nNewFormatNo )
+ ScMarkData aMark, bool bNewSize, sal_uInt16 nNewFormatNo )
: ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT : SC_UNDO_AUTOHEIGHT ),
pUndoDoc ( std::move(pNewUndoDoc) ),
- aMarkData ( rMark ),
+ aMarkData (std::move( aMark )),
bSize ( bNewSize ),
nFormatNo ( nNewFormatNo )
{
@@ -914,14 +915,14 @@ bool ScUndoAutoFormat::CanRepeat(SfxRepeatTarget& rTarget) const
return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr;
}
-ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData& rMark,
+ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, ScMarkData aMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
- const OUString& rNewUndoStr, ScDocumentUniquePtr pNewUndoDoc,
+ OUString aNewUndoStr, ScDocumentUniquePtr pNewUndoDoc,
const SvxSearchItem* pItem )
: ScSimpleUndo( pNewDocShell ),
aCursorPos ( nCurX, nCurY, nCurZ ),
- aMarkData ( rMark ),
- aUndoStr ( rNewUndoStr ),
+ aMarkData (std::move( aMark )),
+ aUndoStr (std::move( aNewUndoStr )),
pUndoDoc ( std::move(pNewUndoDoc) )
{
pSearchItem.reset( new SvxSearchItem( *pItem ) );
@@ -1168,17 +1169,17 @@ bool ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget */) const
}
ScUndoConversion::ScUndoConversion(
- ScDocShell* pNewDocShell, const ScMarkData& rMark,
+ ScDocShell* pNewDocShell, ScMarkData aMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocumentUniquePtr pNewUndoDoc,
SCCOL nNewX, SCROW nNewY, SCTAB nNewZ, ScDocumentUniquePtr pNewRedoDoc,
- const ScConversionParam& rConvParam ) :
+ ScConversionParam aConvParam ) :
ScSimpleUndo( pNewDocShell ),
- aMarkData( rMark ),
+ aMarkData(std::move( aMark )),
aCursorPos( nCurX, nCurY, nCurZ ),
pUndoDoc( std::move(pNewUndoDoc) ),
aNewCursorPos( nNewX, nNewY, nNewZ ),
pRedoDoc( std::move(pNewRedoDoc) ),
- maConvParam( rConvParam )
+ maConvParam(std::move( aConvParam ))
{
SetChangeTrack();
}
@@ -1279,10 +1280,10 @@ bool ScUndoConversion::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell,
- const ScRange& aMarkRange, const ScMarkData& rMark,
+ const ScRange& aMarkRange, ScMarkData aMark,
ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr pNewRedoDoc, bool bNewMulti) :
ScSimpleUndo( pNewDocShell ),
-aMarkData ( rMark ),
+aMarkData (std::move( aMark )),
pUndoDoc ( std::move(pNewUndoDoc) ),
pRedoDoc ( std::move(pNewRedoDoc) ),
aRange ( aMarkRange ),
@@ -1484,15 +1485,15 @@ static ScAreaLink* lcl_FindAreaLink( const sfx2::LinkManager* pLinkManager, std:
}
ScUndoInsertAreaLink::ScUndoInsertAreaLink( ScDocShell* pShell,
- const OUString& rDoc,
- const OUString& rFlt, const OUString& rOpt,
- const OUString& rArea, const ScRange& rDestRange,
+ OUString aDoc,
+ OUString aFlt, OUString aOpt,
+ OUString aArea, const ScRange& rDestRange,
sal_uLong nRefresh )
: ScSimpleUndo ( pShell ),
- aDocName ( rDoc ),
- aFltName ( rFlt ),
- aOptions ( rOpt ),
- aAreaName ( rArea ),
+ aDocName (std::move( aDoc )),
+ aFltName (std::move( aFlt )),
+ aOptions (std::move( aOpt )),
+ aAreaName (std::move( aArea )),
aRange ( rDestRange ),
nRefreshDelay ( nRefresh )
{
@@ -1547,14 +1548,14 @@ bool ScUndoInsertAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
}
ScUndoRemoveAreaLink::ScUndoRemoveAreaLink( ScDocShell* pShell,
- const OUString& rDoc, const OUString& rFlt, const OUString& rOpt,
- const OUString& rArea, const ScRange& rDestRange,
+ OUString aDoc, OUString aFlt, OUString aOpt,
+ OUString aArea, const ScRange& rDestRange,
sal_uLong nRefresh )
: ScSimpleUndo ( pShell ),
- aDocName ( rDoc ),
- aFltName ( rFlt ),
- aOptions ( rOpt ),
- aAreaName ( rArea ),
+ aDocName (std::move( aDoc )),
+ aFltName (std::move( aFlt )),
+ aOptions (std::move( aOpt )),
+ aAreaName (std::move( aArea )),
aRange ( rDestRange ),
nRefreshDelay ( nRefresh )
{
@@ -1609,21 +1610,21 @@ bool ScUndoRemoveAreaLink::CanRepeat(SfxRepeatTarget& /* rTarget */) const
}
ScUndoUpdateAreaLink::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,
+ OUString aOldD, OUString aOldF, OUString aOldO,
+ OUString aOldA, const ScRange& rOldR, sal_uLong nOldRD,
+ OUString aNewD, OUString aNewF, OUString aNewO,
+ OUString aNewA, const ScRange& rNewR, sal_uLong nNewRD,
ScDocumentUniquePtr pUndo, ScDocumentUniquePtr pRedo, bool bDoInsert )
: ScSimpleUndo( pShell ),
- aOldDoc ( rOldD ),
- aOldFlt ( rOldF ),
- aOldOpt ( rOldO ),
- aOldArea ( rOldA ),
+ aOldDoc (std::move( aOldD )),
+ aOldFlt (std::move( aOldF )),
+ aOldOpt (std::move( aOldO )),
+ aOldArea (std::move( aOldA )),
aOldRange ( rOldR ),
- aNewDoc ( rNewD ),
- aNewFlt ( rNewF ),
- aNewOpt ( rNewO ),
- aNewArea ( rNewA ),
+ aNewDoc (std::move( aNewD )),
+ aNewFlt (std::move( aNewF )),
+ aNewOpt (std::move( aNewO )),
+ aNewArea (std::move( aNewA )),
aNewRange ( rNewR ),
xUndoDoc ( std::move(pUndo) ),
xRedoDoc ( std::move(pRedo) ),
generated by cgit (git 2.34.1) at 2025-02-03 12:33:51 +0000