diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-07 17:16:26 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-08-08 08:08:35 +0200 |
commit | a209172669e7a2de6065486e385e4e3007b74bd2 (patch) | |
tree | 4a7e008cf700fb23ecc6e4cd44de1c6a08a9b7e7 /sc/source | |
parent | loplugin:singlevalfields (diff) | |
download | core-a209172669e7a2de6065486e385e4e3007b74bd2.tar.gz core-a209172669e7a2de6065486e385e4e3007b74bd2.zip |
loplugin:constantparam
Change-Id: Ib92aba17c46a4ada75c2a0630f281759d995f32e
Reviewed-on: https://gerrit.libreoffice.org/40843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/data/column.cxx | 12 | ||||
-rw-r--r-- | sc/source/core/data/global.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 3 | ||||
-rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 1 | ||||
-rw-r--r-- | sc/source/ui/inc/undodat.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/undo/undodat.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/unoobj/filtuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun3.cxx | 8 |
8 files changed, 13 insertions, 33 deletions
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index ae2a2e795b7f..3d6e316e6222 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -874,7 +874,6 @@ class CopyToClipHandler ScColumn& mrDestCol; sc::ColumnBlockPosition maDestPos; sc::ColumnBlockPosition* mpDestPos; - bool mbCopyNotes; void setDefaultAttrsToDest(size_t nRow, size_t nSize) { @@ -884,8 +883,8 @@ class CopyToClipHandler } public: - CopyToClipHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, sc::ColumnBlockPosition* pDestPos, bool bCopyNotes) : - mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos), mbCopyNotes(bCopyNotes) + CopyToClipHandler(const ScColumn& rSrcCol, ScColumn& rDestCol, sc::ColumnBlockPosition* pDestPos) : + mrSrcCol(rSrcCol), mrDestCol(rDestCol), mpDestPos(pDestPos) { if (mpDestPos) maDestPos = *mpDestPos; @@ -989,8 +988,7 @@ public: if (bSet) setDefaultAttrsToDest(nTopRow, nDataSize); - if (mbCopyNotes) - mrSrcCol.DuplicateNotes(nTopRow, nDataSize, mrDestCol, maDestPos, false); + mrSrcCol.DuplicateNotes(nTopRow, nDataSize, mrDestCol, maDestPos, false); } }; @@ -1028,7 +1026,7 @@ void ScColumn::CopyToClip( rCxt.isKeepScenarioFlags() ? (ScMF::All & ~ScMF::Scenario) : ScMF::All ); { - CopyToClipHandler aFunc(*this, rColumn, rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol), true/*CloneNotes*/); + CopyToClipHandler aFunc(*this, rColumn, rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol)); sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2); } @@ -1750,7 +1748,7 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const sc::SingleColumnSpanSet::SpansType aRanges; aRangeSet.getSpans(aRanges); - CopyToClipHandler aFunc(*this, rDestCol, nullptr, true/*bCopyNotes*/); + CopyToClipHandler aFunc(*this, rDestCol, nullptr); sc::CellStoreType::const_iterator itPos = maCells.begin(); sc::SingleColumnSpanSet::SpansType::const_iterator it = aRanges.begin(), itEnd = aRanges.end(); for (; it != itEnd; ++it) diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 4a06ca612d6d..d6da69632833 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -786,7 +786,7 @@ bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1, return true; if ( pObj1 && pObj2 ) - return pObj1->Equals( *pObj2, false); + return pObj1->Equals( *pObj2); return false; } diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 302e6d0ccbc0..3932ad66f6ec 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -863,11 +863,10 @@ VclPtr<AbstractScImportOptionsDlg> ScAbstractDialogFactory_Impl::CreateScImportO bool bAscii, const ScImportOptions* pOptions, const OUString* pStrTitle, - bool bMultiByte, bool bOnlyDbtoolsEncodings, bool bImport ) { - VclPtr<ScImportOptionsDlg> pDlg = VclPtr<ScImportOptionsDlg>::Create( nullptr, bAscii, pOptions,pStrTitle, bMultiByte,bOnlyDbtoolsEncodings, bImport ); + VclPtr<ScImportOptionsDlg> pDlg = VclPtr<ScImportOptionsDlg>::Create( nullptr, bAscii, pOptions,pStrTitle, true/*bMultiByte*/,bOnlyDbtoolsEncodings, bImport ); return VclPtr<AbstractScImportOptionsDlg_Impl>::Create( pDlg ); } diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 0970af51a622..7fc7d9d53590 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -534,7 +534,6 @@ public: virtual VclPtr<AbstractScImportOptionsDlg> CreateScImportOptionsDlg ( bool bAscii, const ScImportOptions* pOptions, const OUString* pStrTitle = nullptr, - bool bMultiByte = false, bool bOnlyDbtoolsEncodings = false, bool bImport = true ) override; virtual VclPtr<SfxAbstractTabDialog> CreateScAttrDlg( vcl::Window* pParent, diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index fdb6f3c27504..7f60385d32af 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -430,7 +430,6 @@ public: SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, const ScMarkData& rMark, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, - InsertDeleteFlags nNewFlags, ScRefUndoData* pRefData); virtual void Undo() override; virtual void Redo() override; @@ -443,7 +442,6 @@ private: std::unique_ptr<ScMarkData> mxMarkData; std::unique_ptr<ScDocument> xUndoDoc; std::unique_ptr<ScDocument> xRedoDoc; - InsertDeleteFlags nFlags; std::unique_ptr<ScRefUndoData> xRefUndoData; std::unique_ptr<ScRefUndoData> xRefRedoData; sal_uLong nStartChangeAction; diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 965fcf6f912e..759d49a0b390 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -1719,13 +1719,11 @@ ScUndoDataForm::ScUndoDataForm( ScDocShell* pNewDocShell, SCCOL nEndX, SCROW nEndY, SCTAB nEndZ, const ScMarkData& rMark, ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, - InsertDeleteFlags nNewFlags, ScRefUndoData* pRefData ) : ScBlockUndo(pNewDocShell, ScRange( nStartX, nStartY, nStartZ, nEndX, nEndY, nEndZ ), SC_UNDO_SIMPLE) , mxMarkData(new ScMarkData(rMark)) , xUndoDoc(pNewUndoDoc) , xRedoDoc(pNewRedoDoc) - , nFlags(nNewFlags) , xRefUndoData(pRefData) , bRedoFilled(false) { @@ -1749,12 +1747,7 @@ OUString ScUndoDataForm::GetComment() const void ScUndoDataForm::SetChangeTrack() { - ScChangeTrack* pChangeTrack = pDocShell->GetDocument().GetChangeTrack(); - if ( pChangeTrack && (nFlags & InsertDeleteFlags::CONTENTS) ) - pChangeTrack->AppendContentRange(aBlockRange, xUndoDoc.get(), - nStartChangeAction, nEndChangeAction, SC_CACM_PASTE); - else - nStartChangeAction = nEndChangeAction = 0; + nStartChangeAction = nEndChangeAction = 0; } void ScUndoDataForm::Undo() @@ -1798,13 +1791,6 @@ void ScUndoDataForm::DoChange( const bool bUndo ) ScRefUndoData* pWorkRefData = bUndo ? xRefUndoData.get() : xRefRedoData.get(); - // Always back-up either all or none of the content for Undo - InsertDeleteFlags nUndoFlags = InsertDeleteFlags::NONE; - if (nFlags & InsertDeleteFlags::CONTENTS) - nUndoFlags |= InsertDeleteFlags::CONTENTS; - if (nFlags & InsertDeleteFlags::ATTRIB) - nUndoFlags |= InsertDeleteFlags::ATTRIB; - bool bPaintAll = false; ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index ce02ff831079..3d54306280aa 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -318,7 +318,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() else { ScopedVclPtr<AbstractScImportOptionsDlg> pDlg(pFact->CreateScImportOptionsDlg( - bAscii, &aOptions, &aTitle, true/*bMultiByte*/, + bAscii, &aOptions, &aTitle, bDBEnc, !bExport)); OSL_ENSURE(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 4fab715aafd5..7eacb848350f 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -1994,10 +1994,10 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow , } pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nCurrentRow, nStartTab, nEndCol, nCurrentRow, nEndTab ); // content after the change SfxUndoAction* pUndo = new ScUndoDataForm( pDocSh, - nStartCol, nCurrentRow, nStartTab, - nUndoEndCol, nUndoEndRow, nEndTab, rMark, - pUndoDoc, pRedoDoc, InsertDeleteFlags::NONE, - pUndoData ); + nStartCol, nCurrentRow, nStartTab, + nUndoEndCol, nUndoEndRow, nEndTab, rMark, + pUndoDoc, pRedoDoc, + pUndoData ); pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), true ); PaintPartFlags nPaint = PaintPartFlags::Grid; |