diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:22:39 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:31:36 +0100 |
commit | de29ac09535d814e4be7e1bf0f10beb9f0f847e3 (patch) | |
tree | 139f75d657cb825622e812254b8b7df4e509140b /sc/source/ui/formdlg | |
parent | 60c40af090e420a8619b5236bde1ff4ef79100c6 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I765d2a600f9c57da50c85354688e3ae796750d94
Diffstat (limited to 'sc/source/ui/formdlg')
-rw-r--r-- | sc/source/ui/formdlg/dwfunctr.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/formdlg/formdata.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/formdlg/formula.cxx | 32 |
3 files changed, 22 insertions, 22 deletions
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 1dba9a5976c9..9cb5a305258f 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -97,7 +97,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, aInsertButton ( VclPtr<ImageButton>::Create( this, ResId( IMB_INSERT, *rResId.GetResMgr() ) ) ), aFiFuncDesc ( VclPtr<FixedText>::Create( this, ResId( FI_FUNCDESC, *rResId.GetResMgr() ) ) ), aOldSize (0,0), - pFuncDesc (NULL) + pFuncDesc (nullptr) { FreeResource(); InitLRUList(); @@ -106,7 +106,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, aIdle.SetPriority(SchedulerPriority::LOWER); aIdle.SetIdleHdl(LINK( this, ScFunctionDockWin, TimerHdl)); - if (pCW != NULL) + if (pCW != nullptr) eSfxNewAlignment=GetAlignment(); else eSfxNewAlignment=SfxChildAlignment::RIGHT; @@ -876,7 +876,7 @@ void ScFunctionDockWin::DoEnter() aString += pAllFuncList->GetSelectEntry(); } EditView *pEdView=pHdl->GetActiveView(); - if(pEdView!=NULL) // @ Wegen Absturz bei Namen festlegen + if(pEdView!=nullptr) // @ Wegen Absturz bei Namen festlegen { if(nArgs>0) { @@ -1015,7 +1015,7 @@ IMPL_LINK_NOARG_TYPED(ScFunctionDockWin, TimerHdl, Idle *, void) void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo) { OUString aStr; - if(pInfo!=NULL) + if(pInfo!=nullptr) { if ( !pInfo->aExtraString.isEmpty() ) { diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index c97fa2bf2def..cea864d1330a 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.cxx @@ -21,8 +21,8 @@ ScFormEditData::ScFormEditData() : formula::FormEditData() - , pInputHandler(NULL) - , pScDocShell(NULL) + , pInputHandler(nullptr) + , pScDocShell(nullptr) { Reset(); } diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 0a26cd4d77f8..5e1c7e286ea7 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -58,7 +58,7 @@ using namespace formula; using namespace com::sun::star; -ScDocument* ScFormulaDlg::pDoc = NULL; +ScDocument* ScFormulaDlg::pDoc = nullptr; ScAddress ScFormulaDlg::aCursorPos; // init/ shared functions for dialog @@ -71,7 +71,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, m_aHelper.SetWindow(this); ScModule* pScMod = SC_MOD(); pScMod->InputEnterHandler(); - ScTabViewShell* pScViewShell = NULL; + ScTabViewShell* pScViewShell = nullptr; // title has to be from the view that opened the dialog, // even if it's not the current view @@ -91,7 +91,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, } } - if ( pDoc == NULL ) + if ( pDoc == nullptr ) pDoc = pViewData->GetDocument(); m_xParser.set(ScServiceProvider::MakeInstance(SC_SERVICE_FORMULAPARS, static_cast<ScDocShell*>(pDoc->GetDocumentShell())),uno::UNO_QUERY); uno::Reference< beans::XPropertySet> xSet(m_xParser,uno::UNO_QUERY); @@ -104,7 +104,7 @@ ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, OSL_ENSURE( pInputHdl, "Missing input handler :-/" ); if ( pInputHdl ) - pInputHdl->NotifyChange( NULL ); + pInputHdl->NotifyChange( nullptr ); ScFormulaReferenceHelper::enableInput( false ); ScFormulaReferenceHelper::EnableSpreadsheets(); @@ -189,7 +189,7 @@ void ScFormulaDlg::notifyChange() ScInputHandler* pInputHdl = pScMod->GetInputHdl(); if ( pInputHdl ) - pInputHdl->NotifyChange( NULL ); + pInputHdl->NotifyChange( nullptr ); } void ScFormulaDlg::fill() @@ -212,7 +212,7 @@ void ScFormulaDlg::fill() ScTabViewShell* pTabViewShell; ScInputHandler* pInputHdl = GetNextInputHandler(pData->GetDocShell(),&pTabViewShell); - if ( pInputHdl == NULL ) //no more InputHandler for DocShell + if ( pInputHdl == nullptr ) //no more InputHandler for DocShell { disableOk(); pInputHdl = pScMod->GetInputHdl(); @@ -235,7 +235,7 @@ void ScFormulaDlg::fill() Update(); // switch back, maybe new Doc has been opened - pScMod->SetRefInputHdl(NULL); + pScMod->SetRefInputHdl(nullptr); } } @@ -253,7 +253,7 @@ void ScFormulaDlg::dispose() if (pData) // close dosen't destroy; { //set back reference input handler - pScMod->SetRefInputHdl(NULL); + pScMod->SetRefInputHdl(nullptr); StoreFormEditData(pData); } formula::FormulaDlg::dispose(); @@ -279,17 +279,17 @@ bool ScFormulaDlg::IsInputHdl(ScInputHandler* pHdl) ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell, ScTabViewShell** ppViewSh) { - ScInputHandler* pHdl=NULL; + ScInputHandler* pHdl=nullptr; SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); - while( pFrame && pHdl==NULL) + while( pFrame && pHdl==nullptr) { SfxViewShell* p = pFrame->GetViewShell(); ScTabViewShell* pViewSh = dynamic_cast< ScTabViewShell *>( p ); - if(pViewSh!=NULL) + if(pViewSh!=nullptr) { pHdl=pViewSh->GetInputHandler(); - if(ppViewSh!=NULL) *ppViewSh=pViewSh; + if(ppViewSh!=nullptr) *ppViewSh=pViewSh; } pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ); } @@ -441,7 +441,7 @@ void ScFormulaDlg::SetReference( const ScRange& rRef, ScDocument* pRefDoc ) bool ScFormulaDlg::IsRefInputMode() const { const IFunctionDescription* pDesc = getCurrentFunctionDescription(); - bool bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=NULL); + bool bRef = (pDesc && (pDesc->getSuppressedArgumentCount() > 0)) && (pDoc!=nullptr); return bRef; } @@ -552,11 +552,11 @@ void ScFormulaDlg::deleteFormData() } void ScFormulaDlg::clear() { - pDoc = NULL; + pDoc = nullptr; //restore reference inputhandler ScModule* pScMod = SC_MOD(); - pScMod->SetRefInputHdl(NULL); + pScMod->SetRefInputHdl(nullptr); // force Enable() of edit line ScTabViewShell* pScViewShell = dynamic_cast<ScTabViewShell*>( SfxViewShell::Current() ); @@ -571,7 +571,7 @@ void ScFormulaDlg::switchBack() ScInputHandler* pHdl = pScMod->GetInputHdl(); if ( pHdl ) { - pHdl->ViewShellGone(NULL); // -> get active view + pHdl->ViewShellGone(nullptr); // -> get active view pHdl->ShowRefFrame(); } |