Index: xfa/fxfa/app/xfa_ffpageview.cpp |
diff --git a/xfa/fxfa/app/xfa_ffpageview.cpp b/xfa/fxfa/app/xfa_ffpageview.cpp |
index 16461eb07c05da07514b7230134d445736bade71..06eda5e2e332303f654d2d15028b23cfccb07ed8 100644 |
--- a/xfa/fxfa/app/xfa_ffpageview.cpp |
+++ b/xfa/fxfa/app/xfa_ffpageview.cpp |
@@ -154,10 +154,10 @@ CXFA_FFWidget* CXFA_FFPageWidgetIterator::MoveToFirst() { |
return hWidget; |
} |
} |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFWidget* CXFA_FFPageWidgetIterator::MoveToLast() { |
- m_sIterator.SetCurrent(NULL); |
+ m_sIterator.SetCurrent(nullptr); |
return MoveToPrevious(); |
} |
CXFA_FFWidget* CXFA_FFPageWidgetIterator::MoveToNext() { |
@@ -167,7 +167,7 @@ CXFA_FFWidget* CXFA_FFPageWidgetIterator::MoveToNext() { |
return hWidget; |
} |
} |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFWidget* CXFA_FFPageWidgetIterator::MoveToPrevious() { |
for (CXFA_LayoutItem* pLayoutItem = m_sIterator.MoveToPrev(); pLayoutItem; |
@@ -176,11 +176,11 @@ CXFA_FFWidget* CXFA_FFPageWidgetIterator::MoveToPrevious() { |
return hWidget; |
} |
} |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetCurrentWidget() { |
CXFA_LayoutItem* pLayoutItem = m_sIterator.GetCurrent(); |
- return pLayoutItem ? XFA_GetWidgetFromLayoutItem(pLayoutItem) : NULL; |
+ return pLayoutItem ? XFA_GetWidgetFromLayoutItem(pLayoutItem) : nullptr; |
} |
FX_BOOL CXFA_FFPageWidgetIterator::SetCurrentWidget(CXFA_FFWidget* hWidget) { |
return hWidget && m_sIterator.SetCurrent(hWidget); |
@@ -189,7 +189,7 @@ CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetWidget( |
CXFA_LayoutItem* pLayoutItem) { |
if (CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pLayoutItem)) { |
if (!PageWidgetFilter(pWidget, m_dwFilter, FALSE, m_bIgnorerelevant)) { |
- return NULL; |
+ return nullptr; |
} |
if (!pWidget->IsLoaded() && |
(pWidget->GetStatus() & XFA_WidgetStatus_Visible) != 0) { |
@@ -197,7 +197,7 @@ CXFA_FFWidget* CXFA_FFPageWidgetIterator::GetWidget( |
} |
return pWidget; |
} |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFTabOrderPageWidgetIterator::CXFA_FFTabOrderPageWidgetIterator( |
@@ -226,7 +226,7 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToFirst() { |
} |
} |
} |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToLast() { |
if (m_TabOrderWidgetArray.GetSize() > 0) { |
@@ -238,7 +238,7 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToLast() { |
} |
} |
} |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToNext() { |
for (int32_t i = m_iCurWidget + 1; i < m_TabOrderWidgetArray.GetSize(); i++) { |
@@ -249,7 +249,7 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToNext() { |
} |
} |
m_iCurWidget = -1; |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToPrevious() { |
for (int32_t i = m_iCurWidget - 1; i >= 0; i--) { |
@@ -260,13 +260,13 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::MoveToPrevious() { |
} |
} |
m_iCurWidget = -1; |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetCurrentWidget() { |
if (m_iCurWidget >= 0) { |
return m_TabOrderWidgetArray[m_iCurWidget]; |
} |
- return NULL; |
+ return nullptr; |
} |
FX_BOOL CXFA_FFTabOrderPageWidgetIterator::SetCurrentWidget( |
CXFA_FFWidget* hWidget) { |
@@ -290,7 +290,7 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetTraverseWidget( |
} |
} |
} |
- return NULL; |
+ return nullptr; |
} |
CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::FindWidgetByName( |
const CFX_WideString& wsWidgetName, |
@@ -411,7 +411,7 @@ void CXFA_FFTabOrderPageWidgetIterator::CreateSpaceOrderWidgetArray( |
CXFA_TabParam* pParam = new CXFA_TabParam; |
FX_BOOL bCurrentItem = FALSE; |
FX_BOOL bContentArea = FALSE; |
- OrderContainer(&sIterator, NULL, pParam, bCurrentItem, bContentArea); |
+ OrderContainer(&sIterator, nullptr, pParam, bCurrentItem, bContentArea); |
if (pParam->m_Children.GetSize() > 0) { |
WidgetArray.Append(pParam->m_Children); |
} |
@@ -419,7 +419,7 @@ void CXFA_FFTabOrderPageWidgetIterator::CreateSpaceOrderWidgetArray( |
bCurrentItem = FALSE; |
bContentArea = FALSE; |
pParam->m_Children.RemoveAll(); |
- OrderContainer(&sIterator, NULL, pParam, bCurrentItem, bContentArea, TRUE); |
+ OrderContainer(&sIterator, nullptr, pParam, bCurrentItem, bContentArea, TRUE); |
if (pParam->m_Children.GetSize() > 0) { |
WidgetArray.Append(pParam->m_Children); |
} |
@@ -434,5 +434,5 @@ CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetWidget( |
} |
return pWidget; |
} |
- return NULL; |
+ return nullptr; |
} |