diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:46:17 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:46:17 +0200 |
commit | 103bc8ff3ce9df931508a172a140afdfb7af2577 (patch) | |
tree | 71c1edbd40131c0d3d97a6c34dcffeafb6e4870f /sc/source/ui/view | |
parent | d1d67644164f57c07ffb3355e3279326866613a2 (diff) |
loplugin:defaultparams
Change-Id: If189c1e4254ae00725ec76a5ca6354d24df2d351
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r-- | sc/source/ui/view/cellsh1.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/drawvie4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin4.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin5.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/printfun.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun2.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun3.cxx | 9 | ||||
-rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 2 |
9 files changed, 14 insertions, 15 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 3244d4596e5d..821255ee4c1d 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1865,7 +1865,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } else // CANCEL { - pScMod->ActivateInputWindow( nullptr ); + pScMod->ActivateInputWindow(); } rReq.Ignore(); // only SID_ENTER_STRING is recorded } diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index fb3e6b796292..3000b759b54e 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -971,7 +971,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) SvMemoryStream aStream; aStream.SetStreamCharSet( RTL_TEXTENCODING_UNICODE ); ScImportExport::SetNoEndianSwap( aStream ); - aExport.ExportStream( aStream, OUString(), SotClipboardFormatId::STRING ); + aExport.ExportStream( aStream, OUString() ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE( pFact, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pFact is null!" ); @@ -996,7 +996,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aImport.SetImportBroadcast( true ); aImport.SetOverwriting( true ); aStream.Seek( 0 ); - aImport.ImportStream( aStream, OUString(), SotClipboardFormatId::STRING ); + aImport.ImportStream( aStream, OUString() ); pDocSh->GetUndoManager()->LeaveListAction(); } diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index acbe5defcc40..26b90adcd676 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -109,7 +109,7 @@ bool ScDrawView::BeginDrag( vcl::Window* pWindow, const Point& rStartPos ) if (bAnyOle) { aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately - aDragShellRef->DoInitNew(NULL); + aDragShellRef->DoInitNew(); } ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); SdrModel* pModel = GetMarkedObjModel(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 51e4b1923d0d..51ae5fdc8397 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -975,7 +975,7 @@ void ScGridWindow::PaintTile( VirtualDevice& rDevice, double fPPTY = pViewData->GetPPTY(); ScTableInfo aTabInfo; - pDoc->FillInfo(aTabInfo, nStartCol, nStartRow, nEndCol, nEndRow, nTab, fPPTX, fPPTY, false, false, NULL); + pDoc->FillInfo(aTabInfo, nStartCol, nStartRow, nEndCol, nEndRow, nTab, fPPTX, fPPTY, false, false); ScOutputData aOutputData(&rDevice, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab, -fTilePosXPixel, -fTilePosYPixel, nStartCol, nStartRow, nEndCol, nEndRow, diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index e7678b7c025a..947d20b07ad7 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -377,7 +377,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) if ( aHelpText.isEmpty() ) // Text-URL { OUString aUrl; - if ( GetEditUrl( aPosPixel, NULL, &aUrl, NULL ) ) + if ( GetEditUrl( aPosPixel, NULL, &aUrl ) ) { aHelpText = INetURLObject::decode( aUrl, INetURLObject::DECODE_UNAMBIGUOUS ); diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 74f72158b7d2..4e9f6c4c9af1 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -2929,7 +2929,7 @@ Size ScPrintFunc::GetDocPageSize() void ScPrintFunc::ResetBreaks( SCTAB nTab ) // Set Breaks correctly for view { pDoc->SetPageSize( nTab, GetDocPageSize() ); - pDoc->UpdatePageBreaks( nTab, NULL ); + pDoc->UpdatePageBreaks( nTab ); } static void lcl_SetHidden( ScDocument* pDoc, SCTAB nPrintTab, ScPageRowEntry& rPageRowEntry, @@ -2976,7 +2976,7 @@ void ScPrintFunc::CalcPages() // calculates aPageRect and pages fr } else { - pDoc->UpdatePageBreaks( nPrintTab, NULL ); // else, end is marked + pDoc->UpdatePageBreaks( nPrintTab ); // else, end is marked } const size_t nRealCnt = nEndRow-nStartRow+1; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index eec6a8a594b9..7fd92aa5bdc2 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -1895,7 +1895,7 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, ScRangeList aMatchedRanges; ScTable::UpdateSearchItemAddressForReplace( aSearchItem, nCol, nRow ); - if ( rDoc.SearchAndReplace( aSearchItem, nCol, nRow, nTab, rMark, aMatchedRanges, aUndoStr, NULL ) && + if ( rDoc.SearchAndReplace( aSearchItem, nCol, nRow, nTab, rMark, aMatchedRanges, aUndoStr ) && ( nTab == nOldTab ) && ( nCol != nOldCol || nRow != nOldRow ) ) { diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 7eb9aa62af12..af8dbeca931e 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -682,8 +682,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran return; PasteDataFormat( nFormatId, aDataHelper.GetTransferable(), - GetViewData().GetCurX(), GetViewData().GetCurY(), - NULL ); + GetViewData().GetCurX(), GetViewData().GetCurY() ); } } } @@ -911,7 +910,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags, ScDocument* pClipDoc, if ( bPasteDraw ) { aTransShellRef = new ScDocShell; // DocShell needs a Ref immediately - aTransShellRef->DoInitNew(NULL); + aTransShellRef->DoInitNew(); } ScDrawLayer::SetGlobalDrawPersist(aTransShellRef); @@ -1691,7 +1690,7 @@ bool ScViewFunc::PasteFromClipToMultiRanges( { pDoc->CopyFromClip( *aRanges[i], aMark, (nFlags & ~IDF_OBJECTS), NULL, pClipDoc, - false, false, true, bSkipEmpty, NULL); + false, false, true, bSkipEmpty); } if (pMixDoc.get()) @@ -1709,7 +1708,7 @@ bool ScViewFunc::PasteFromClipToMultiRanges( { pDoc->CopyFromClip( *aRanges[i], aMark, IDF_OBJECTS, NULL, pClipDoc, - false, false, true, bSkipEmpty, NULL); + false, false, true, bSkipEmpty); } } diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index dd8bb7e7c9e3..1891ec07ec34 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -491,7 +491,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, OUString aPath = aPathOpt.GetPalettePath(); ScDocShellRef aDragShellRef( new ScDocShell ); - aDragShellRef->DoInitNew(NULL); + aDragShellRef->DoInitNew(); std::unique_ptr<FmFormModel> pModel(new FmFormModel( aPath, NULL, aDragShellRef )); pModel->GetItemPool().FreezeIdRanges(); |