sc/source/ui/inc/viewfunc.hxx | 2 +-
sc/source/ui/view/viewfun3.cxx | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 38b8ca62dd07f119ad78f738d706cb1a80e23517
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Mar 24 11:24:43 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Mar 25 09:15:26 2022 +0100
loplugin:constantparam
Change-Id: If19a34e7f358e213d8827a107cc744a968ac6c54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132084
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 80b9b090bcad..2b72ce50ff73 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -356,7 +356,7 @@ private:
bool PasteMultiRangesFromClip(
InsertDeleteFlags nFlags, ScDocument* pClipDoc,
- ScPasteFunc nFunction, bool bSkipEmptyCells, bool bIncludeFiltered,
+ ScPasteFunc nFunction, bool bSkipEmptyCells,
bool bTranspose, bool bAsLink, bool bAllowDialogs,
InsCellCmd eMoveMode, InsertDeleteFlags nUndoFlags );
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 031a5b34b3cf..d2afed84d0b1 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -900,7 +900,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags,
ScDocument* pClipDoc,
if (rClipParam.isMultiRange())
{
// Source data is multi-range.
- return PasteMultiRangesFromClip(nFlags, pClipDoc, nFunction,
bSkipEmptyCells, false, bTranspose,
+ return PasteMultiRangesFromClip(nFlags, pClipDoc, nFunction,
bSkipEmptyCells, bTranspose,
bAsLink, bAllowDialogs, eMoveMode,
nUndoFlags);
}
@@ -1464,7 +1464,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags,
ScDocument* pClipDoc,
bool ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags,
ScDocument* pClipDoc,
ScPasteFunc nFunction, bool
bSkipEmptyCells,
- bool bIncludeFiltered, bool
bTranspose, bool bAsLink,
+ bool bTranspose, bool bAsLink,
bool bAllowDialogs, InsCellCmd
eMoveMode,
InsertDeleteFlags nUndoFlags)
{
@@ -1475,7 +1475,7 @@ bool
ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument*
const ScAddress& rCurPos = rViewData.GetCurPos();
ScClipParam& rClipParam = pClipDoc->GetClipParam();
SCCOL nColSize = rClipParam.getPasteColSize();
- SCROW nRowSize = rClipParam.getPasteRowSize(*pClipDoc, bIncludeFiltered);
+ SCROW nRowSize = rClipParam.getPasteRowSize(*pClipDoc,
/*bIncludeFiltered*/false);
if (bTranspose)
{
@@ -1486,7 +1486,7 @@ bool
ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument*
}
ScDocumentUniquePtr pTransClip(new ScDocument(SCDOCMODE_CLIP));
- pClipDoc->TransposeClip(pTransClip.get(), nFlags, bAsLink,
bIncludeFiltered);
+ pClipDoc->TransposeClip(pTransClip.get(), nFlags, bAsLink,
/*bIncludeFiltered*/false);
pClipDoc = pTransClip.release();
SCCOL nTempColSize = nColSize;
nColSize = static_cast<SCCOL>(nRowSize);
@@ -1577,7 +1577,7 @@ bool
ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument*
if (bAsLink && bTranspose)
nCopyFlags |= InsertDeleteFlags::FORMULA;
rDoc.CopyMultiRangeFromClip(rCurPos, aMark, nCopyFlags, pClipDoc, true,
bAsLink && !bTranspose,
- bIncludeFiltered, bSkipEmptyCells);
+ /*bIncludeFiltered*/false, bSkipEmptyCells);
if (pMixDoc)
rDoc.MixDocument(aMarkedRange, nFunction, bSkipEmptyCells, *pMixDoc);
@@ -1588,7 +1588,7 @@ bool
ScViewFunc::PasteMultiRangesFromClip(InsertDeleteFlags nFlags, ScDocument*
{
// Paste the drawing objects after the row heights have been updated.
rDoc.CopyMultiRangeFromClip(rCurPos, aMark,
InsertDeleteFlags::OBJECTS, pClipDoc, true,
- false, bIncludeFiltered, true);
+ false, /*bIncludeFiltered*/false, true);
}
if (bRowInfo)
