| Index: fpdfsdk/formfiller/cffl_formfiller.cpp
 | 
| diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
 | 
| index 8ee6da387d3975082d9d6282ae00ff92b220a057..d7bc9586a4a49a9fb4bb23424e549c54787a0674 100644
 | 
| --- a/fpdfsdk/formfiller/cffl_formfiller.cpp
 | 
| +++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
 | 
| @@ -88,7 +88,8 @@ void CFFL_FormFiller::OnDraw(CPDFSDK_PageView* pPageView,
 | 
|    } else {
 | 
|      CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
 | 
|      if (CFFL_IFormFiller::IsVisible(pWidget))
 | 
| -      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
 | 
| +      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal,
 | 
| +                              nullptr);
 | 
|    }
 | 
|  }
 | 
|  
 | 
| @@ -98,7 +99,7 @@ void CFFL_FormFiller::OnDrawDeactive(CPDFSDK_PageView* pPageView,
 | 
|                                       CFX_Matrix* pUser2Device,
 | 
|                                       uint32_t dwFlags) {
 | 
|    CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
 | 
| -  pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
 | 
| +  pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
 | 
|  }
 | 
|  
 | 
|  void CFFL_FormFiller::OnCreate(CPDFSDK_Annot* pAnnot) {}
 | 
| @@ -293,7 +294,7 @@ PWL_CREATEPARAM CFFL_FormFiller::GetCreateParam() {
 | 
|    ASSERT(m_pApp);
 | 
|  
 | 
|    PWL_CREATEPARAM cp;
 | 
| -  cp.pParentWnd = NULL;
 | 
| +  cp.pParentWnd = nullptr;
 | 
|    cp.pProvider = this;
 | 
|    cp.rcRectWnd = GetPDFWindowRect();
 | 
|  
 | 
| @@ -690,23 +691,25 @@ void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView,
 | 
|    CPDF_FormControl::HighlightingMode eHM = pCtrl->GetHighlightingMode();
 | 
|  
 | 
|    if (eHM != CPDF_FormControl::Push) {
 | 
| -    pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
 | 
| +    pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
 | 
|      return;
 | 
|    }
 | 
|  
 | 
|    if (m_bMouseDown) {
 | 
|      if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Down))
 | 
| -      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Down, NULL);
 | 
| +      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Down, nullptr);
 | 
|      else
 | 
| -      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
 | 
| +      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal,
 | 
| +                              nullptr);
 | 
|    } else if (m_bMouseIn) {
 | 
|      if (pWidget->IsWidgetAppearanceValid(CPDF_Annot::Rollover))
 | 
|        pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Rollover,
 | 
| -                              NULL);
 | 
| +                              nullptr);
 | 
|      else
 | 
| -      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
 | 
| +      pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal,
 | 
| +                              nullptr);
 | 
|    } else {
 | 
| -    pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
 | 
| +    pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
 | 
|    }
 | 
|  }
 | 
|  
 | 
| 
 |