sc/source/ui/dbgui/pvfundlg.cxx | 5 ++---
sc/source/ui/inc/pvfundlg.hxx | 2 +-
sc/source/ui/inc/undoblk.hxx | 26 +++++++++++++-------------
sc/source/ui/undo/undoblk.cxx | 16 ++++++++--------
sc/source/ui/undo/undoblk2.cxx | 5 ++---
sc/source/ui/undo/undoblk3.cxx | 32 ++++++++++++++++----------------
6 files changed, 42 insertions(+), 44 deletions(-)
New commits:
commit 0c9c3f75d7f0d44efc4fe1d6320a07de8c04b36e
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 8 12:50:46 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Aug 9 10:02:13 2022 +0200
cid#1507857 Big parameter passed by value
and
cid#1507854 Big parameter passed by value
cid#1507853 Big parameter passed by value
cid#1507848 Big parameter passed by value
cid#1507846 Big parameter passed by value
cid#1507844 Big parameter passed by value
cid#1507843 Big parameter passed by value
cid#1507842 Big parameter passed by value
cid#1507845 Big parameter passed by value
cid#1507847 Big parameter passed by value
cid#1507849 Big parameter passed by value
cid#1507855 Big parameter passed by value
cid#1507850 Big parameter passed by value
cid#1507852 Big parameter passed by value
Change-Id: I03138b93d0936fe5e62453651227f3925a7b4b83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137981
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 84fde939a580..90a13e920352 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -36,7 +36,6 @@
#include <globstr.hrc>
#include <dputil.hxx>
-#include <utility>
#include <vector>
using namespace ::com::sun::star::sheet;
@@ -646,7 +645,7 @@ namespace
}
ScDPSubtotalOptDlg::ScDPSubtotalOptDlg(weld::Window* pParent, ScDPObject&
rDPObj,
- ScDPLabelData aLabelData, const ScDPNameVec& rDataFields,
+ const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields,
bool bEnableLayout )
: GenericDialogController(pParent,
"modules/scalc/ui/datafieldoptionsdialog.ui",
"DataFieldOptionsDialog")
@@ -672,7 +671,7 @@ ScDPSubtotalOptDlg::ScDPSubtotalOptDlg(weld::Window*
pParent, ScDPObject& rDPObj
, m_xBtnOk(m_xBuilder->weld_button("ok"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
, mrDPObj(rDPObj)
- , maLabelData(std::move(aLabelData))
+ , maLabelData(rLabelData)
{
m_xLbHide->enable_toggle_buttons(weld::ColumnToggleType::Check);
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 9a7fa4a1f2b4..17a20526be02 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -137,7 +137,7 @@ class ScDPSubtotalOptDlg : public
weld::GenericDialogController
{
public:
explicit ScDPSubtotalOptDlg(weld::Window* pParent, ScDPObject&
rDPObj,
- ScDPLabelData aLabelData, const ScDPNameVec&
rDataFields,
+ const ScDPLabelData& rLabelData, const
ScDPNameVec& rDataFields,
bool bEnableLayout );
virtual ~ScDPSubtotalOptDlg() override;
void FillLabelData( ScDPLabelData& rLabelData ) const;
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index fef867d5bbdf..9bda36a1e176 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -137,7 +137,7 @@ public:
ScUndoCut(ScDocShell* pNewDocShell,
const ScRange& aRange, // adjusted for merged cells
const ScAddress& aOldEnd, // end position without adjustment
- ScMarkData aMark, // selected sheets
+ const ScMarkData& rMark, // selected sheets
ScDocumentUniquePtr pNewUndoDoc);
virtual ~ScUndoCut() override;
@@ -181,7 +181,7 @@ class SC_DLLPUBLIC ScUndoPaste: public ScMultiBlockUndo
{
public:
ScUndoPaste(ScDocShell* pNewDocShell, const ScRangeList& rRanges,
- ScMarkData aMark,
+ const ScMarkData& rMark,
ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr
pNewRedoDoc,
InsertDeleteFlags nNewFlags,
std::unique_ptr<ScRefUndoData> pRefData,
@@ -249,7 +249,7 @@ class ScUndoDeleteContents: public ScSimpleUndo
{
public:
ScUndoDeleteContents( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
const ScRange& rRange,
ScDocumentUniquePtr&& pNewUndoDoc,
bool bNewMulti,
InsertDeleteFlags nNewFlags, bool
bObjects );
@@ -284,7 +284,7 @@ class ScUndoFillTable: public ScSimpleUndo
{
public:
ScUndoFillTable( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB
nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocumentUniquePtr pNewUndoDoc, bool
bNewMulti, SCTAB nSrc,
@@ -320,7 +320,7 @@ class ScUndoSelectionAttr: public ScSimpleUndo
{
public:
ScUndoSelectionAttr( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB
nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocumentUniquePtr pNewUndoDoc, bool
bNewMulti,
@@ -357,7 +357,7 @@ class ScUndoWidthOrHeight: public ScSimpleUndo
{
public:
ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
SCCOLROW nNewStart, SCTAB
nNewStartTab,
SCCOLROW nNewEnd, SCTAB nNewEndTab,
ScDocumentUniquePtr pNewUndoDoc,
@@ -394,7 +394,7 @@ class ScUndoAutoFill: public ScBlockUndo
public:
ScUndoAutoFill( ScDocShell* pNewDocShell,
const ScRange& rRange, const ScRange&
rSourceArea,
- ScDocumentUniquePtr pNewUndoDoc,
ScMarkData aMark,
+ ScDocumentUniquePtr pNewUndoDoc, const
ScMarkData& rMark,
FillDir eNewFillDir,
FillCmd eNewFillCmd, FillDateCmd
eNewFillDateCmd,
double fNewStartValue, double
fNewStepValue, double fNewMaxValue );
@@ -453,7 +453,7 @@ class ScUndoAutoFormat: public ScBlockUndo
public:
ScUndoAutoFormat( ScDocShell* pNewDocShell,
const ScRange& rRange,
ScDocumentUniquePtr pNewUndoDoc,
- ScMarkData aMark,
+ const ScMarkData& rMark,
bool bNewSize, sal_uInt16 nNewFormatNo );
virtual ~ScUndoAutoFormat() override;
@@ -476,7 +476,7 @@ class ScUndoReplace: public ScSimpleUndo
{
public:
ScUndoReplace( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
OUString aNewUndoStr, ScDocumentUniquePtr
pNewUndoDoc,
const SvxSearchItem* pItem );
@@ -537,7 +537,7 @@ class ScUndoConversion : public ScSimpleUndo
{
public:
- ScUndoConversion( ScDocShell* pNewDocShell, ScMarkData
aMark,
+ ScUndoConversion( ScDocShell* pNewDocShell, const
ScMarkData& rMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
ScDocumentUniquePtr pNewUndoDoc,
SCCOL nNewX, SCROW nNewY, SCTAB nNewZ,
ScDocumentUniquePtr pNewRedoDoc,
ScConversionParam aConvParam );
@@ -568,7 +568,7 @@ class ScUndoRefConversion: public ScSimpleUndo
{
public:
ScUndoRefConversion( ScDocShell* pNewDocShell,
- const ScRange& aMarkRange, ScMarkData
aMark,
+ const ScRange& aMarkRange, const
ScMarkData& rMark,
ScDocumentUniquePtr pNewUndoDoc,
ScDocumentUniquePtr pNewRedoDoc, bool bNewMulti);
virtual ~ScUndoRefConversion() override;
@@ -659,7 +659,7 @@ class ScUndoUseScenario: public ScSimpleUndo
{
public:
ScUndoUseScenario( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
const ScArea& rDestArea,
ScDocumentUniquePtr pNewUndoDoc,
OUString aNewName );
virtual ~ScUndoUseScenario() override;
@@ -683,7 +683,7 @@ class ScUndoSelectionStyle: public ScSimpleUndo
{
public:
ScUndoSelectionStyle( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
const ScRange& rRange,
OUString aName,
ScDocumentUniquePtr pNewUndoDoc );
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 68f9351c5897..0ef3e22f66b1 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -814,9 +814,9 @@ bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget)
const
}
ScUndoCut::ScUndoCut(ScDocShell* pNewDocShell, const ScRange& aRange, const
ScAddress& aOldEnd,
- ScMarkData aMark, ScDocumentUniquePtr pNewUndoDoc)
+ const ScMarkData& rMark, ScDocumentUniquePtr pNewUndoDoc)
: ScBlockUndo(pNewDocShell, ScRange(aRange.aStart, aOldEnd),
SC_UNDO_AUTOHEIGHT)
- , aMarkData(std::move(aMark))
+ , aMarkData(rMark)
, pUndoDoc(std::move(pNewUndoDoc))
, aExtendedRange(aRange)
{
@@ -913,13 +913,13 @@ bool ScUndoCut::CanRepeat(SfxRepeatTarget& rTarget) const
}
ScUndoPaste::ScUndoPaste( ScDocShell* pNewDocShell, const ScRangeList& rRanges,
- ScMarkData aMark,
+ const ScMarkData& rMark,
ScDocumentUniquePtr pNewUndoDoc, ScDocumentUniquePtr
pNewRedoDoc,
InsertDeleteFlags nNewFlags,
std::unique_ptr<ScRefUndoData> pRefData,
bool bRedoIsFilled, const ScUndoPasteOptions* pOptions ) :
ScMultiBlockUndo( pNewDocShell, rRanges ),
- aMarkData(std::move( aMark )),
+ aMarkData( rMark ),
pUndoDoc( std::move(pNewUndoDoc) ),
pRedoDoc( std::move(pNewRedoDoc) ),
nFlags( nNewFlags ),
@@ -1671,13 +1671,13 @@ bool
ScUndoConditionalFormatList::CanRepeat(SfxRepeatTarget& ) const
}
ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
/*C*/ const ScArea& rDestArea,
ScDocumentUniquePtr pNewUndoDoc,
OUString aNewName ) :
ScSimpleUndo( pNewDocShell ),
pUndoDoc( std::move(pNewUndoDoc) ),
- aMarkData(std::move( aMark )),
+ aMarkData( rMark ),
aName(std::move( aNewName ))
{
aRange.aStart.SetCol(rDestArea.nColStart);
@@ -1790,12 +1790,12 @@ bool ScUndoUseScenario::CanRepeat(SfxRepeatTarget&
rTarget) const
}
ScUndoSelectionStyle::ScUndoSelectionStyle( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
const ScRange& rRange,
OUString aName,
ScDocumentUniquePtr pNewUndoDoc ) :
ScSimpleUndo( pNewDocShell ),
- aMarkData(std::move( aMark )),
+ aMarkData( rMark ),
pUndoDoc( std::move(pNewUndoDoc) ),
aStyleName(std::move( aName )),
aRange( rRange )
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index c296d0b811c1..52ee421cc3de 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -31,17 +31,16 @@
#include <undoolk.hxx>
#include <svx/svdundo.hxx>
-#include <utility>
/** Change column widths or row heights */
ScUndoWidthOrHeight::ScUndoWidthOrHeight( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
SCCOLROW nNewStart, SCTAB nNewStartTab, SCCOLROW nNewEnd,
SCTAB nNewEndTab,
ScDocumentUniquePtr pNewUndoDoc, std::vector<sc::ColRowSpan>&&
rRanges,
std::unique_ptr<ScOutlineTable> pNewUndoTab,
ScSizeMode eNewMode, sal_uInt16 nNewSizeTwips, bool bNewWidth
) :
ScSimpleUndo( pNewDocShell ),
- aMarkData(std::move( aMark )),
+ aMarkData( rMark ),
nStart( nNewStart ),
nEnd( nNewEnd ),
nStartTab( nNewStartTab ),
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 79c4c7252705..da7fa26ff9c1 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -58,12 +58,12 @@
ScUndoDeleteContents::ScUndoDeleteContents(
ScDocShell* pNewDocShell,
- ScMarkData aMark, const ScRange& rRange,
+ const ScMarkData& rMark, const ScRange& rRange,
ScDocumentUniquePtr&& pNewUndoDoc, bool bNewMulti,
InsertDeleteFlags nNewFlags, bool bObjects )
: ScSimpleUndo( pNewDocShell ),
aRange ( rRange ),
- aMarkData (std::move( aMark )),
+ aMarkData ( rMark ),
pUndoDoc ( std::move(pNewUndoDoc) ),
nFlags ( nNewFlags ),
bMulti ( bNewMulti ) // unnecessary
@@ -204,14 +204,14 @@ bool ScUndoDeleteContents::CanRepeat(SfxRepeatTarget&
rTarget) const
}
ScUndoFillTable::ScUndoFillTable( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
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 (std::move( aMark )),
+ aMarkData ( rMark ),
pUndoDoc ( std::move(pNewUndoDoc) ),
nFlags ( nFlg ),
nFunction ( nFunc ),
@@ -340,7 +340,7 @@ bool ScUndoFillTable::CanRepeat(SfxRepeatTarget& rTarget)
const
}
ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell* pNewDocShell,
- ScMarkData aMark,
+ const ScMarkData& rMark,
SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
SCCOL nEndX, SCROW nEndY, SCTAB nEndZ,
ScDocumentUniquePtr pNewUndoDoc, bool bNewMulti,
@@ -348,7 +348,7 @@ ScUndoSelectionAttr::ScUndoSelectionAttr( ScDocShell*
pNewDocShell,
const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner,
const ScRange* pRangeCover )
: ScSimpleUndo( pNewDocShell ),
- aMarkData (std::move( aMark )),
+ aMarkData ( rMark ),
aRange ( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ),
mpDataArray(new ScEditDataArray),
pUndoDoc ( std::move(pNewUndoDoc) ),
@@ -483,12 +483,12 @@ bool ScUndoSelectionAttr::CanRepeat(SfxRepeatTarget&
rTarget) const
ScUndoAutoFill::ScUndoAutoFill( ScDocShell* pNewDocShell,
const ScRange& rRange, const ScRange& rSourceArea,
- ScDocumentUniquePtr pNewUndoDoc, ScMarkData aMark,
+ ScDocumentUniquePtr pNewUndoDoc, const ScMarkData& rMark,
FillDir eNewFillDir, FillCmd eNewFillCmd, FillDateCmd
eNewFillDateCmd,
double fNewStartValue, double fNewStepValue, double
fNewMaxValue )
: ScBlockUndo( pNewDocShell, rRange, SC_UNDO_AUTOHEIGHT ),
aSource ( rSourceArea ),
- aMarkData (std::move( aMark )),
+ aMarkData ( rMark ),
pUndoDoc ( std::move(pNewUndoDoc) ),
eFillDir ( eNewFillDir ),
eFillCmd ( eNewFillCmd ),
@@ -767,10 +767,10 @@ bool ScUndoMerge::CanRepeat(SfxRepeatTarget& rTarget)
const
ScUndoAutoFormat::ScUndoAutoFormat( ScDocShell* pNewDocShell,
const ScRange& rRange, ScDocumentUniquePtr pNewUndoDoc,
- ScMarkData aMark, bool bNewSize, sal_uInt16
nNewFormatNo )
+ const ScMarkData& rMark, bool bNewSize, sal_uInt16
nNewFormatNo )
: ScBlockUndo( pNewDocShell, rRange, bNewSize ? SC_UNDO_MANUALHEIGHT :
SC_UNDO_AUTOHEIGHT ),
pUndoDoc ( std::move(pNewUndoDoc) ),
- aMarkData (std::move( aMark )),
+ aMarkData ( rMark ),
bSize ( bNewSize ),
nFormatNo ( nNewFormatNo )
{
@@ -915,13 +915,13 @@ bool ScUndoAutoFormat::CanRepeat(SfxRepeatTarget&
rTarget) const
return dynamic_cast<const ScTabViewTarget*>( &rTarget) != nullptr;
}
-ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, ScMarkData aMark,
+ScUndoReplace::ScUndoReplace( ScDocShell* pNewDocShell, const ScMarkData&
rMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ,
OUString aNewUndoStr, ScDocumentUniquePtr
pNewUndoDoc,
const SvxSearchItem* pItem )
: ScSimpleUndo( pNewDocShell ),
aCursorPos ( nCurX, nCurY, nCurZ ),
- aMarkData (std::move( aMark )),
+ aMarkData ( rMark ),
aUndoStr (std::move( aNewUndoStr )),
pUndoDoc ( std::move(pNewUndoDoc) )
{
@@ -1169,12 +1169,12 @@ bool ScUndoTabOp::CanRepeat(SfxRepeatTarget& /* rTarget
*/) const
}
ScUndoConversion::ScUndoConversion(
- ScDocShell* pNewDocShell, ScMarkData aMark,
+ ScDocShell* pNewDocShell, const ScMarkData& rMark,
SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScDocumentUniquePtr pNewUndoDoc,
SCCOL nNewX, SCROW nNewY, SCTAB nNewZ, ScDocumentUniquePtr pNewRedoDoc,
ScConversionParam aConvParam ) :
ScSimpleUndo( pNewDocShell ),
- aMarkData(std::move( aMark )),
+ aMarkData( rMark ),
aCursorPos( nCurX, nCurY, nCurZ ),
pUndoDoc( std::move(pNewUndoDoc) ),
aNewCursorPos( nNewX, nNewY, nNewZ ),
@@ -1280,10 +1280,10 @@ bool ScUndoConversion::CanRepeat(SfxRepeatTarget&
rTarget) const
}
ScUndoRefConversion::ScUndoRefConversion( ScDocShell* pNewDocShell,
- const ScRange& aMarkRange, ScMarkData
aMark,
+ const ScRange& aMarkRange, const
ScMarkData& rMark,
ScDocumentUniquePtr pNewUndoDoc,
ScDocumentUniquePtr pNewRedoDoc, bool bNewMulti) :
ScSimpleUndo( pNewDocShell ),
-aMarkData (std::move( aMark )),
+aMarkData ( rMark ),
pUndoDoc ( std::move(pNewUndoDoc) ),
pRedoDoc ( std::move(pNewRedoDoc) ),
aRange ( aMarkRange ),
