Index: xfa/fxfa/app/xfa_ffnotify.cpp |
diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp |
index 12792bc9964109c75342da47f20f023ceb954f84..248796524f2e5ff74a06e7cd1ab96a6ff68256c3 100644 |
--- a/xfa/fxfa/app/xfa_ffnotify.cpp |
+++ b/xfa/fxfa/app/xfa_ffnotify.cpp |
@@ -57,7 +57,7 @@ void CXFA_FFNotify::OnWidgetListItemAdded(CXFA_WidgetData* pSender, |
return; |
CXFA_FFWidget* pWidget = nullptr; |
- while ((pWidget = pWidgetAcc->GetNextWidget(pWidget)) != nullptr) { |
+ while ((pWidget = pWidgetAcc->GetNextWidget(pWidget))) { |
if (pWidget->IsLoaded()) { |
if (pWidgetAcc->IsListBox()) { |
static_cast<CXFA_FFListBox*>(pWidget)->InsertItem(pLabel, iIndex); |
@@ -75,7 +75,7 @@ void CXFA_FFNotify::OnWidgetListItemRemoved(CXFA_WidgetData* pSender, |
return; |
CXFA_FFWidget* pWidget = nullptr; |
- while ((pWidget = pWidgetAcc->GetNextWidget(pWidget)) != nullptr) { |
+ while ((pWidget = pWidgetAcc->GetNextWidget(pWidget))) { |
if (pWidget->IsLoaded()) { |
if (pWidgetAcc->IsListBox()) { |
static_cast<CXFA_FFListBox*>(pWidget)->DeleteItem(iIndex); |
@@ -221,7 +221,7 @@ int32_t CXFA_FFNotify::ExecEventByDeepFirst(CXFA_Node* pFormNode, |
} |
return pDocView->ExecEventActivityByDeepFirst( |
pFormNode, eEventType, bIsFormReady, bRecursive, |
- pExclude ? pExclude->GetNode() : NULL); |
+ pExclude ? pExclude->GetNode() : nullptr); |
} |
void CXFA_FFNotify::AddCalcValidate(CXFA_Node* pNode) { |
CXFA_FFDocView* pDocView = m_pDoc->GetDocView(); |
@@ -247,7 +247,7 @@ IXFA_AppProvider* CXFA_FFNotify::GetAppProvider() { |
} |
CXFA_FFWidgetHandler* CXFA_FFNotify::GetWidgetHandler() { |
CXFA_FFDocView* pDocView = m_pDoc->GetDocView(); |
- return pDocView ? pDocView->GetWidgetHandler() : NULL; |
+ return pDocView ? pDocView->GetWidgetHandler() : nullptr; |
} |
CXFA_FFWidget* CXFA_FFNotify::GetHWidget(CXFA_LayoutItem* pLayoutItem) { |
return XFA_GetWidgetFromLayoutItem(pLayoutItem); |
@@ -299,10 +299,10 @@ void CXFA_FFNotify::RunSubformIndexChange(CXFA_Node* pSubformNode) { |
CXFA_Node* CXFA_FFNotify::GetFocusWidgetNode() { |
CXFA_FFDocView* pDocView = m_pDoc->GetDocView(); |
if (!pDocView) { |
- return NULL; |
+ return nullptr; |
} |
CXFA_WidgetAcc* pAcc = pDocView->GetFocusWidgetAcc(); |
- return pAcc ? pAcc->GetNode() : NULL; |
+ return pAcc ? pAcc->GetNode() : nullptr; |
} |
void CXFA_FFNotify::SetFocusWidgetNode(CXFA_Node* pNode) { |
CXFA_FFDocView* pDocView = m_pDoc->GetDocView(); |
@@ -360,7 +360,7 @@ void CXFA_FFNotify::OnValueChanging(CXFA_Node* pSender, XFA_ATTRIBUTE eAttr) { |
return; |
CXFA_FFWidget* pWidget = nullptr; |
- while ((pWidget = pWidgetAcc->GetNextWidget(pWidget)) != nullptr) { |
+ while ((pWidget = pWidgetAcc->GetNextWidget(pWidget))) { |
if (pWidget->IsLoaded()) |
pWidget->AddInvalidateRect(); |
} |
@@ -422,7 +422,7 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender, |
} |
} |
CXFA_FFWidget* pWidget = nullptr; |
- while ((pWidget = pWidgetAcc->GetNextWidget(pWidget)) != nullptr) { |
+ while ((pWidget = pWidgetAcc->GetNextWidget(pWidget))) { |
if (!pWidget->IsLoaded()) |
continue; |