Merge to XFA: Get rid of most instance of 'foo != NULL'

fpdfsdk/src/formfiller/FFL_ListBox.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 #include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
 #include "fpdfsdk/include/formfiller/FFL_ListBox.h"
 #include "fpdfsdk/include/formfiller/FormFiller.h"
 
 #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f
 
 /* ------------------------------- CFFL_ListBox -------------------------------
  */
 
 CFFL_ListBox::CFFL_ListBox(CPDFDoc_Environment* pApp, CPDFSDK_Annot* pWidget)
     : CFFL_FormFiller(pApp, pWidget), m_pFontMap(NULL) {}
 
 CFFL_ListBox::~CFFL_ListBox() {
   delete m_pFontMap;
 }
 
 PWL_CREATEPARAM CFFL_ListBox::GetCreateParam() {
   PWL_CREATEPARAM cp = CFFL_FormFiller::GetCreateParam();
 
-  ASSERT(m_pWidget != NULL);
   FX_DWORD dwFieldFlag = m_pWidget->GetFieldFlags();
 
   if (dwFieldFlag & FIELDFLAG_MULTISELECT) {
     cp.dwFlags |= PLBS_MULTIPLESEL;
   }
 
   cp.dwFlags |= PWS_VSCROLL;
 
   if (cp.dwFlags & PWS_AUTOFONTSIZE)
     cp.fFontSize = FFL_DEFAULTLISTBOXFONTSIZE;
 
   if (!m_pFontMap) {
     m_pFontMap = new CBA_FontMap(m_pWidget, m_pApp->GetSysHandler());
     m_pFontMap->Initial();
   }
   cp.pFontMap = m_pFontMap;
 
   return cp;
 }
 
 CPWL_Wnd* CFFL_ListBox::NewPDFWindow(const PWL_CREATEPARAM& cp,
                                      CPDFSDK_PageView* pPageView) {
   CPWL_ListBox* pWnd = new CPWL_ListBox();
   pWnd->AttachFFLData(this);
   pWnd->Create(cp);
 
-  ASSERT(m_pApp != NULL);
   CFFL_IFormFiller* pIFormFiller = m_pApp->GetIFormFiller();
   pWnd->SetFillerNotify(pIFormFiller);
 
   for (int32_t i = 0, sz = m_pWidget->CountOptions(); i < sz; i++)
     pWnd->AddString(m_pWidget->GetOptionLabel(i).c_str());
 
   if (pWnd->HasFlag(PLBS_MULTIPLESEL)) {
     m_OriginSelections.clear();
 
     FX_BOOL bSetCaret = FALSE;
@@ skipping 42 matching lines @@
         ++nSelCount;
       }
     }
 
     return nSelCount != m_OriginSelections.size();
   }
   return pListBox->GetCurSel() != m_pWidget->GetSelectedIndex(0);
 }
 
 void CFFL_ListBox::SaveData(CPDFSDK_PageView* pPageView) {
-  ASSERT(m_pWidget != NULL);
+  ASSERT(m_pWidget);
 
   if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) {
     CFX_IntArray aOldSelect, aNewSelect;
 
     {
       for (int i = 0, sz = m_pWidget->CountOptions(); i < sz; i++) {
         if (m_pWidget->IsOptionSelected(i)) {
           aOldSelect.Add(i);
         }
       }
@@ skipping 25 matching lines @@
 void CFFL_ListBox::GetActionData(CPDFSDK_PageView* pPageView,
                                  CPDF_AAction::AActionType type,
                                  PDFSDK_FieldAction& fa) {
   switch (type) {
     case CPDF_AAction::Validate:
       if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) {
         fa.sValue = L"";
       } else {
         if (CPWL_ListBox* pListBox =
                 (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) {
-          ASSERT(m_pWidget != NULL);
           int32_t nCurSel = pListBox->GetCurSel();
           if (nCurSel >= 0)
             fa.sValue = m_pWidget->GetOptionLabel(nCurSel);
         }
       }
       break;
     case CPDF_AAction::LoseFocus:
     case CPDF_AAction::GetFocus:
       if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) {
         fa.sValue = L"";
       } else {
-        ASSERT(m_pWidget != NULL);
         int32_t nCurSel = m_pWidget->GetSelectedIndex(0);
         if (nCurSel >= 0)
           fa.sValue = m_pWidget->GetOptionLabel(nCurSel);
       }
       break;
     default:
       break;
   }
 }
 
 void CFFL_ListBox::SetActionData(CPDFSDK_PageView* pPageView,
                                  CPDF_AAction::AActionType type,
                                  const PDFSDK_FieldAction& fa) {}
 
 void CFFL_ListBox::SaveState(CPDFSDK_PageView* pPageView) {
-  ASSERT(pPageView != NULL);
+  ASSERT(pPageView);
 
   if (CPWL_ListBox* pListBox = (CPWL_ListBox*)GetPDFWindow(pPageView, FALSE)) {
     for (int32_t i = 0, sz = pListBox->GetCount(); i < sz; i++) {
       if (pListBox->IsItemSelected(i)) {
         m_State.Add(i);
       }
     }
   }
 }
 
@@ skipping 16 matching lines @@
   if (bRestoreValue) {
     RestoreState(pPageView);
     pRet = GetPDFWindow(pPageView, FALSE);
   } else
     pRet = GetPDFWindow(pPageView, TRUE);
 
   m_pWidget->UpdateField();
 
   return pRet;
 }