Chromium Code Reviews| Index: xfa/fwl/lightwidget/cfwl_combobox.cpp |
| diff --git a/xfa/fwl/lightwidget/cfwl_combobox.cpp b/xfa/fwl/lightwidget/cfwl_combobox.cpp |
| index 9d20c9782496585254d339793707bff7bdd3ba8b..91aa3eb8b46c714c9bbd41cf20e295a52ee15c83 100644 |
| --- a/xfa/fwl/lightwidget/cfwl_combobox.cpp |
| +++ b/xfa/fwl/lightwidget/cfwl_combobox.cpp |
| @@ -170,7 +170,7 @@ void* CFWL_ComboBox::GetItemData(int32_t iIndex) { |
| CFWL_ComboBoxItem* pItem = |
| static_cast<CFWL_ComboBoxItem*>(m_comboBoxData.GetItem(m_pIface, iIndex)); |
| if (!pItem) |
| - return NULL; |
| + return nullptr; |
| return pItem->m_pData; |
|
Lei Zhang
2016/06/23 18:21:44
ternary
dsinclair
2016/06/23 18:46:53
Done.
|
| } |
| @@ -358,7 +358,7 @@ FWL_Error CFWL_ComboBox::CFWL_ComboBoxDP::GetItemRect(IFWL_Widget* pWidget, |
| void* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemData(IFWL_Widget* pWidget, |
| IFWL_ListItem* pItem) { |
| if (!pItem) |
| - return NULL; |
| + return nullptr; |
| return static_cast<CFWL_ComboBoxItem*>(pItem)->m_pData; |
|
Lei Zhang
2016/06/23 18:21:44
ternary
dsinclair
2016/06/23 18:46:53
Done.
|
| } |
| @@ -397,7 +397,7 @@ CFX_DIBitmap* CFWL_ComboBox::CFWL_ComboBoxDP::GetItemIcon( |
| IFWL_Widget* pWidget, |
| IFWL_ListItem* pItem) { |
| if (!pItem) |
| - return NULL; |
| + return nullptr; |
| return static_cast<CFWL_ComboBoxItem*>(pItem)->m_pDIB; |
|
Lei Zhang
2016/06/23 18:21:44
ternary
dsinclair
2016/06/23 18:46:53
Done.
|
| } |