From 682b9b33c71066bbf703c22e9689367e7bd569b6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 24 Mar 2016 11:38:51 +0200 Subject: loplugin:constantparam in sc Change-Id: I8608a6cb47972e9b838cc5ea431863348758ded0 --- sc/source/ui/docshell/arealink.cxx | 2 +- sc/source/ui/docshell/dbdocfun.cxx | 4 ++-- sc/source/ui/docshell/dbdocimp.cxx | 4 ++-- sc/source/ui/docshell/docfunc.cxx | 8 ++++---- sc/source/ui/docshell/docsh.cxx | 2 +- sc/source/ui/docshell/docsh3.cxx | 6 +++--- sc/source/ui/docshell/docsh5.cxx | 2 +- sc/source/ui/docshell/docsh8.cxx | 4 ++-- sc/source/ui/docshell/impex.cxx | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'sc/source/ui/docshell') diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index d9ef58035daf..fc689e410e20 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -372,7 +372,7 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, aSourceMark.SetMarkArea( aTokenRange ); ScClipParam aClipParam(aTokenRange, false); - rSrcDoc.CopyToClip(aClipParam, &aClipDoc, &aSourceMark); + rSrcDoc.CopyToClip(aClipParam, &aClipDoc, &aSourceMark, false, false); if ( aClipDoc.HasAttrib( 0,0,nSrcTab, MAXCOL,MAXROW,nSrcTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) ) diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 05ea76a84449..73c0dc94595a 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -559,7 +559,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, { ScInputOptions aInputOption = SC_MOD()->GetInputOptions(); bool bUpdateRefs = aInputOption.GetSortRefUpdate(); - ScProgress aProgress(&rDocShell, ScGlobal::GetRscString(STR_PROGRESS_SORTING), 0); + ScProgress aProgress(&rDocShell, ScGlobal::GetRscString(STR_PROGRESS_SORTING), 0, true); rDoc.Sort(nTab, aLocalParam, bRepeatQuery, bUpdateRefs, &aProgress, &aUndoParam); } @@ -823,7 +823,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, sal_uLong nProgCount = nFormulaCols; nProgCount *= aLocalParam.nRow2 - nFStartY; ScProgress aProgress( rDoc.GetDocumentShell(), - ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount ); + ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount, true ); rDoc.Fill( aLocalParam.nCol2+1, nFStartY, aLocalParam.nCol2+nFormulaCols, nFStartY, &aProgress, aMark, diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 52cb9ed931d9..45a68e64e851 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -190,7 +190,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, { // progress bar // only text (title is still needed, for the cancel button) - ScProgress aProgress( &rDocShell, ScGlobal::GetRscString(STR_UNDO_IMPORTDATA), 0 ); + ScProgress aProgress( &rDocShell, ScGlobal::GetRscString(STR_UNDO_IMPORTDATA), 0, true ); uno::Reference xRowSet( xResultSet, uno::UNO_QUERY ); bool bDispose = false; @@ -554,7 +554,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, sal_uLong nProgCount = nFormulaCols; nProgCount *= nEndRow-rParam.nRow1-1; ScProgress aProgress( rDoc.GetDocumentShell(), - ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount ); + ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount, true ); rDoc.Fill( nEndCol+1, rParam.nRow1+1, nEndCol+nFormulaCols, rParam.nRow1+1, &aProgress, aMark, nEndRow-rParam.nRow1-1, FILL_TO_BOTTOM, FILL_SIMPLE ); diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 81e7caa26d8d..a879464dd884 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -2614,7 +2614,7 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); ScClipParam aClipParam(ScRange(nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nStartTab), bCut); - rDoc.CopyToClip(aClipParam, pClipDoc, &aSourceMark, false, bScenariosAdded, true); + rDoc.CopyToClip(aClipParam, pClipDoc, &aSourceMark, bScenariosAdded, true); ScDrawLayer::SetGlobalDrawPersist(nullptr); @@ -4348,7 +4348,7 @@ bool ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, nProgCount = aSourceArea.aEnd.Row() - aSourceArea.aStart.Row() + 1; nProgCount *= nCount; ScProgress aProgress( rDoc.GetDocumentShell(), - ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount ); + ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount, true ); rDoc.Fill( aSourceArea.aStart.Col(), aSourceArea.aStart.Row(), aSourceArea.aEnd.Col(), aSourceArea.aEnd.Row(), &aProgress, @@ -4475,7 +4475,7 @@ bool ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, nProgCount = aSourceArea.aEnd.Row() - aSourceArea.aStart.Row() + 1; nProgCount *= nCount; ScProgress aProgress( rDoc.GetDocumentShell(), - ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount ); + ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount, true ); rDoc.Fill( aSourceArea.aStart.Col(), aSourceArea.aStart.Row(), aSourceArea.aEnd.Col(), aSourceArea.aEnd.Row(), &aProgress, @@ -4614,7 +4614,7 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e nProgCount = aSourceArea.aEnd.Row() - aSourceArea.aStart.Row() + 1; nProgCount *= nCount; ScProgress aProgress( rDoc.GetDocumentShell(), - ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount ); + ScGlobal::GetRscString(STR_FILL_SERIES_PROGRESS), nProgCount, true ); rDoc.Fill( aSourceArea.aStart.Col(), aSourceArea.aStart.Row(), aSourceArea.aEnd.Col(), aSourceArea.aEnd.Row(), &aProgress, diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 4c69ed1965df..22f3af51e2d1 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1855,7 +1855,7 @@ void ScDocShell::AsciiSave( SvStream& rStream, const ScImportOptions& rAsciiOpt SCROW nEndRow; aDocument.GetCellArea( nTab, nEndCol, nEndRow ); - ScProgress aProgress( this, ScGlobal::GetRscString( STR_SAVE_DOC ), nEndRow ); + ScProgress aProgress( this, ScGlobal::GetRscString( STR_SAVE_DOC ), nEndRow, true ); OUString aString; diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index f9bb67114e8f..a97add2150b6 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -293,12 +293,12 @@ void ScDocShell::SetLockCount(sal_uInt16 nNew) { if ( !pPaintLockData ) pPaintLockData = new ScPaintLockData; - pPaintLockData->SetLevel(nNew-1, true); + pPaintLockData->SetDocLevel(nNew-1); LockDocument_Impl(nNew); } else if (pPaintLockData) // loeschen { - pPaintLockData->SetLevel(0, true); // bei Unlock sofort ausfuehren + pPaintLockData->SetDocLevel(0); // bei Unlock sofort ausfuehren UnlockPaint_Impl(true); // jetzt UnlockDocument_Impl(0); } @@ -828,7 +828,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck // ab hier kein return mehr ScProgress aProgress( this, OUString("..."), - nNewActionCount ); + nNewActionCount, true ); sal_uLong nLastMergeAction = pSourceTrack->GetLast()->GetActionNumber(); // UpdateReference-Undo, gueltige Referenzen fuer den letzten gemeinsamen Zustand diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 74ddbd84b480..6d3717305fa5 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -974,7 +974,7 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec } ScProgress* pProgress = new ScProgress(this, ScGlobal::GetRscString(STR_UNDO_MOVE_TAB), - aDocument.GetCodeCount()); + aDocument.GetCodeCount(), true); bool bDone = aDocument.MoveTab( nSrcTab, nDestTab, pProgress ); delete pProgress; if (!bDone) diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 35cd59f0306e..2ea750ff808d 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -316,7 +316,7 @@ sal_uLong ScDocShell::DBaseImport( const OUString& rFullFileName, rtl_TextEncodi return nRet; ::utl::DisposableComponent aConnectionHelper(xConnection); - ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), 0 ); + ScProgress aProgress( this, ScGlobal::GetRscString( STR_LOAD_DOC ), 0, true ); uno::Reference xFactory = comphelper::getProcessServiceFactory(); uno::Reference xRowSet( xFactory->createInstance(SC_SERVICE_ROWSET), uno::UNO_QUERY); @@ -807,7 +807,7 @@ sal_uLong ScDocShell::DBaseExport( const OUString& rFullFileName, rtl_TextEncodi if ( nFirstRow > nLastRow ) nFirstRow = nLastRow; ScProgress aProgress( this, ScGlobal::GetRscString( STR_SAVE_DOC ), - nLastRow - nFirstRow ); + nLastRow - nFirstRow, true ); SvNumberFormatter* pNumFmt = aDocument.GetFormatTable(); bool bHasFieldNames = true; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 39cf5be29b0f..dd8a98d370e4 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1267,7 +1267,7 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm ) sal_uInt64 const nOldPos = rStrm.Tell(); sal_uInt64 const nRemaining = rStrm.remainingSize(); std::unique_ptr xProgress( new ScProgress( pDocSh, - ScGlobal::GetRscString( STR_LOAD_DOC ), nRemaining )); + ScGlobal::GetRscString( STR_LOAD_DOC ), nRemaining, true )); rStrm.StartReadingUnicodeText( rStrm.GetStreamCharSet() ); SCCOL nStartCol = aRange.aStart.Col(); -- cgit v1.2.3