diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:46:31 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-20 11:46:31 +0200 |
commit | 109f9fa26ad4ca92fa7e654b62499ad676c586e4 (patch) | |
tree | 4c0f12eee6a14b35198d3f4a8909b709cdbed400 /sfx2 | |
parent | 332056e19798c7d1dcf9ab60589e9d156ff4baf3 (diff) |
loplugin:defaultparams
Change-Id: I06cebd331b04ee496b2c3efecce4542705092e12
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/appl/app.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appserv.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/bastyp/fltfnc.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/shell.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/dialog/dockwin.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/doc/objcont.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/doc/objserv.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/doc/objstor.cxx | 11 | ||||
-rw-r--r-- | sfx2/source/doc/sfxbasemodel.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/statbar/stbitem.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 2 |
13 files changed, 21 insertions, 25 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 858d97938781..055eaa369545 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -228,7 +228,7 @@ SfxApplication::~SfxApplication() #if HAVE_FEATURE_DESKTOP delete pSfxHelp; - Application::SetHelp( NULL ); + Application::SetHelp(); #endif // delete global options diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 4fa868e6e4d0..c684399b2c89 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -1035,7 +1035,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) if ( !pView ) { SfxObjectShell* pBasicIDE = SfxObjectShell::CreateObject( lcl_getBasicIDEServiceName() ); - pBasicIDE->DoInitNew( 0 ); + pBasicIDE->DoInitNew(); pBasicIDE->SetModified( false ); try { diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index f1cf9f8ffe4a..12b8197f4c3a 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -864,7 +864,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4FilterName( const OUString& rName, IMPL_LINK_TYPED( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString, bool ) { - const SfxFilter* pFilter = GetFilter4Extension( *pString, SfxFilterFlags::IMPORT ); + const SfxFilter* pFilter = GetFilter4Extension( *pString ); if (pFilter && !pFilter->GetWildcard().Matches( OUString() ) && !pFilter->GetWildcard().Matches(OUString("*.*")) && !pFilter->GetWildcard().Matches(OUString('*')) diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 8b63eaa20bc4..37623d2411ce 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -408,13 +408,13 @@ bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) void ShellCall_Impl( void* pObj, void* pArg ) { - static_cast<SfxShell*>(pObj)->ExecuteSlot( *static_cast<SfxRequest*>(pArg), nullptr ); + static_cast<SfxShell*>(pObj)->ExecuteSlot( *static_cast<SfxRequest*>(pArg) ); } const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, bool bAsync ) { if( !bAsync ) - return ExecuteSlot( rReq, nullptr ); + return ExecuteSlot( rReq ); else { if( !pImp->pExecuter ) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 043c6bc98621..ba6298987b16 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1707,7 +1707,7 @@ void SfxDockingWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle } DecorationView aView(&rRenderContext); - aView.DrawFrame(aRect, DrawFrameStyle::Out); + aView.DrawFrame(aRect); } /** With this method, a minimal OutputSize be can set, that is queried in diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 000ee9ac17fe..745151638126 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2154,7 +2154,7 @@ IMPL_LINK_TYPED( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool { nLastItemId = pMenu->GetCurItemId(); Application::PostUserEvent( - LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl ), 0 ); + LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectAsyncHdl ) ); return true; } diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 87acdbf39a73..6e272bc62342 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -1019,8 +1019,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, SfxItemSet* pDialogParams = &aDialogParams; TransformParameters( nSlotID, GetMediaDescr().getAsConstPropertyValueList(), - aDialogParams, - NULL ); + aDialogParams ); const SfxPoolItem* pItem = NULL; if ( bPreselectPassword && aDialogParams.GetItemState( SID_ENCRYPTIONDATA, true, &pItem ) != SfxItemState::SET ) @@ -1048,7 +1047,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, pDialogParams->ClearItem( SID_RECOMMENDREADONLY ); uno::Sequence< beans::PropertyValue > aPropsFromDialog; - TransformItems( nSlotID, *pDialogParams, aPropsFromDialog, NULL ); + TransformItems( nSlotID, *pDialogParams, aPropsFromDialog ); GetMediaDescr() << aPropsFromDialog; // get the path from the dialog diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index ce7c9279fe1d..10ebf6ea7439 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -490,7 +490,7 @@ void SfxObjectShell::UpdateFromTemplate_Impl( ) // styles should be updated, create document in organizer mode to read in the styles //TODO: testen! SfxObjectShellLock xTemplDoc = CreateObjectByFactoryName( GetFactory().GetFactoryName(), SfxObjectCreateMode::ORGANIZER ); - xTemplDoc->DoInitNew(0); + xTemplDoc->DoInitNew(); // TODO/MBA: do we need a BaseURL? Then LoadFrom must be extended! //xTemplDoc->SetBaseURL( aFoundName ); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index fd16f1bb7317..8aecba13a9ed 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -637,8 +637,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if ( rReq.GetArgs() ) TransformItems( nId, *rReq.GetArgs(), - aDispatchArgs, - NULL ); + aDispatchArgs ); const SfxSlot* pSlot = GetModule()->GetSlotPool()->GetSlot( nId ); if ( !pSlot ) @@ -667,8 +666,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) SfxAllItemSet aResultParams( GetPool() ); TransformParameters( nId, aDispatchArgs, - aResultParams, - NULL ); + aResultParams ); rReq.SetArgs( aResultParams ); // the StoreAsURL/StoreToURL method have called this method with false diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 1c792420be4e..d9c733e5d018 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -928,7 +928,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo pSet->Put( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) ); Sequence< PropertyValue > rProperties; - TransformItems( SID_OPENDOC, *pSet, rProperties, NULL ); + TransformItems( SID_OPENDOC, *pSet, rProperties ); RequestFilterOptions* pFORequest = new RequestFilterOptions( pDoc->GetModel(), rProperties ); com::sun::star::uno::Reference< XInteractionRequest > rRequest( pFORequest ); @@ -939,8 +939,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo SfxAllItemSet aNewParams( pDoc->GetPool() ); TransformParameters( SID_OPENDOC, pFORequest->getFilterOptions(), - aNewParams, - NULL ); + aNewParams ); const SfxStringItem* pFilterOptions = aNewParams.GetItem<SfxStringItem>(SID_FILE_FILTEROPTIONS, false); if ( pFilterOptions ) @@ -2551,7 +2550,7 @@ bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs ) SetError( pMediumTmp->GetError(), OUString( OSL_LOG_PREFIX ) ); // reconnect to object storage - DoSaveCompleted( 0 ); + DoSaveCompleted(); if( pRetrMedium->GetItemSet() ) { @@ -2822,7 +2821,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& bOk = DoSaveCompleted( pNewFile ); } else - bOk = DoSaveCompleted(0); + bOk = DoSaveCompleted(); if( bOk ) { @@ -2857,7 +2856,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl(const OUString& rFileName, const OUString& SetError( pNewFile->GetErrorCode(), OUString( OSL_LOG_PREFIX ) ); // reconnect to the old storage - DoSaveCompleted( 0 ); + DoSaveCompleted(); DELETEZ( pNewFile ); } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index c6dbe54b0cd6..5263318367d5 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1770,7 +1770,7 @@ void SAL_CALL SfxBaseModel::initNew() if( m_pData->m_pObjectShell->GetMedium() ) throw frame::DoubleInitializationException(); - bool bRes = m_pData->m_pObjectShell->DoInitNew( NULL ); + bool bRes = m_pData->m_pObjectShell->DoInitNew(); sal_uInt32 nErrCode = m_pData->m_pObjectShell->GetError() ? m_pData->m_pObjectShell->GetError() : ERRCODE_IO_CANTCREATE; m_pData->m_pObjectShell->ResetError(); @@ -3802,7 +3802,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& { // storing without a valid filter will often crash bSuccess = m_pData->m_pObjectShell->DoSaveObjectAs( aMedium, true ); - m_pData->m_pObjectShell->DoSaveCompleted( NULL ); + m_pData->m_pObjectShell->DoSaveCompleted(); } } diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index afa7638bb4ec..b2eca349ff7a 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -110,7 +110,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( if ( pModule ) pSlotPool = pModule->GetSlotPool(); else - pSlotPool = &(SfxSlotPool::GetSlotPool( NULL )); + pSlotPool = &(SfxSlotPool::GetSlotPool()); const SfxSlot* pSlot = pSlotPool->GetUnoSlot( aTargetURL.Path ); if ( pSlot ) diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 2bca60cf3a01..c8b899cc6e45 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -171,7 +171,7 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X if ( pModule ) pSlotPool = pModule->GetSlotPool(); else - pSlotPool = &(SfxSlotPool::GetSlotPool( NULL )); + pSlotPool = &(SfxSlotPool::GetSlotPool()); const SfxSlot* pSlot = pSlotPool->GetUnoSlot( aTargetURL.Path ); if ( pSlot ) |