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

core/src/fpdfdoc/doc_formfield.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 "core/include/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 FX_BOOL PDF_FormField_IsUnison(CPDF_FormField* pField) {
@@ skipping 166 matching lines @@
       CPDF_Object* pRV = FPDF_GetFieldAttr(m_pDict, "RV");
       if (!pRV && (csDValue == csValue)) {
         return FALSE;
       }
       if (bNotify && m_pForm->m_pFormNotify) {
         int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csDValue);
         if (iRet < 0) {
           return FALSE;
         }
       }
-      if (pDV == NULL) {
-        m_pDict->RemoveAt("V");
-        m_pDict->RemoveAt("RV");
-      } else {
+      if (pDV) {
         CPDF_Object* pClone = pDV->Clone();
-        if (pClone == NULL) {
+        if (!pClone) {
           return FALSE;
         }
         m_pDict->SetAt("V", pClone);
         if (pRV) {
           CPDF_Object* pCloneR = pDV->Clone();
           m_pDict->SetAt("RV", pCloneR);
         }
+      } else {
+        m_pDict->RemoveAt("V");
+        m_pDict->RemoveAt("RV");
       }
       if (bNotify && m_pForm->m_pFormNotify) {
         m_pForm->m_pFormNotify->AfterValueChange(this);
       }
       m_pForm->m_bUpdated = TRUE;
     } break;
   }
   return TRUE;
 }
 int CPDF_FormField::GetControlIndex(const CPDF_FormControl* pControl) {
@@ skipping 24 matching lines @@
       return FIELDTYPE_TEXTFIELD;
     case Sign:
       return FIELDTYPE_SIGNATURE;
     default:
       break;
   }
   return FIELDTYPE_UNKNOWN;
 }
 CPDF_AAction CPDF_FormField::GetAdditionalAction() {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "AA");
-  if (pObj == NULL) {
+  if (!pObj) {
     return NULL;
   }
   return pObj->GetDict();
 }
 CFX_WideString CPDF_FormField::GetAlternateName() {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TU");
-  if (pObj == NULL) {
+  if (!pObj) {
     return L"";
   }
   return pObj->GetUnicodeText();
 }
 CFX_WideString CPDF_FormField::GetMappingName() {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TM");
-  if (pObj == NULL) {
+  if (!pObj) {
     return L"";
   }
   return pObj->GetUnicodeText();
 }
 FX_DWORD CPDF_FormField::GetFieldFlags() {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "Ff");
-  if (pObj == NULL) {
+  if (!pObj) {
     return 0;
   }
   return pObj->GetInteger();
 }
 CFX_ByteString CPDF_FormField::GetDefaultStyle() {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "DS");
-  if (pObj == NULL) {
+  if (!pObj) {
     return "";
   }
   return pObj->GetString();
 }
 CFX_WideString CPDF_FormField::GetRichTextString() {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "RV");
-  if (pObj == NULL) {
+  if (!pObj) {
     return L"";
   }
   return pObj->GetUnicodeText();
 }
 CFX_WideString CPDF_FormField::GetValue(FX_BOOL bDefault) {
   if (GetType() == CheckBox || GetType() == RadioButton) {
     return GetCheckValue(bDefault);
   }
   CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, bDefault ? "DV" : "V");
-  if (pValue == NULL) {
+  if (!pValue) {
     if (!bDefault) {
       if (m_Type == RichText) {
         pValue = FPDF_GetFieldAttr(m_pDict, "V");
       }
-      if (pValue == NULL && m_Type != Text) {
+      if (!pValue && m_Type != Text) {
         pValue = FPDF_GetFieldAttr(m_pDict, "DV");
       }
     }
-    if (pValue == NULL) {
+    if (!pValue) {
       return CFX_WideString();
     }
   }
   switch (pValue->GetType()) {
     case PDFOBJ_STRING:
     case PDFOBJ_STREAM:
       return pValue->GetUnicodeText();
     case PDFOBJ_ARRAY:
       pValue = pValue->AsArray()->GetElementValue(0);
       if (pValue)
@@ skipping 191 matching lines @@
 FX_BOOL CPDF_FormField::IsItemSelected(int index) {
   ASSERT(GetType() == ComboBox || GetType() == ListBox);
   if (index < 0 || index >= CountOptions()) {
     return FALSE;
   }
   if (IsOptionSelected(index)) {
     return TRUE;
   }
   CFX_WideString opt_value = GetOptionValue(index);
   CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
-  if (pValue == NULL) {
+  if (!pValue) {
     pValue = FPDF_GetFieldAttr(m_pDict, "I");
-    if (pValue == NULL) {
+    if (!pValue) {
       return FALSE;
     }
   }
 
   if (pValue->IsString())
     return pValue->GetUnicodeText() == opt_value;
 
   if (pValue->IsNumber()) {
     if (pValue->GetString().IsEmpty())
       return FALSE;
@@ skipping 69 matching lines @@
         m_pDict->RemoveAt("I");
       }
     }
   } else {
     if (m_Type == ListBox) {
       SelectOption(index, TRUE);
       if (!(m_Flags & FORMLIST_MULTISELECT)) {
         m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
       } else {
         CPDF_Array* pArray = CPDF_Array::Create();
-        if (pArray == NULL) {
+        if (!pArray) {
           return FALSE;
         }
         FX_BOOL bSelected;
         int iCount = CountOptions();
         for (int i = 0; i < iCount; i++) {
           if (i != index) {
             bSelected = IsItemSelected(i);
           } else {
             bSelected = TRUE;
           }
           if (bSelected) {
             opt_value = GetOptionValue(i);
             pArray->AddString(PDF_EncodeText(opt_value));
           }
         }
         m_pDict->SetAt("V", pArray);
       }
     } else if (m_Type == ComboBox) {
       m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
       CPDF_Array* pI = CPDF_Array::Create();
-      if (pI == NULL) {
+      if (!pI) {
         return FALSE;
       }
       pI->AddInteger(index);
       m_pDict->SetAt("I", pI);
     }
   }
   if (bNotify && m_pForm->m_pFormNotify) {
     if (GetType() == ListBox) {
       m_pForm->m_pFormNotify->AfterSelectionChange(this);
     }
@@ skipping 14 matching lines @@
   }
   int iDVIndex = GetDefaultSelectedItem();
   if (iDVIndex < 0) {
     return FALSE;
   }
   return (iDVIndex == index);
 }
 int CPDF_FormField::GetDefaultSelectedItem() {
   ASSERT(GetType() == ComboBox || GetType() == ListBox);
   CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "DV");
-  if (pValue == NULL) {
+  if (!pValue) {
     return -1;
   }
   CFX_WideString csDV = pValue->GetUnicodeText();
   if (csDV.IsEmpty()) {
     return -1;
   }
   int iCount = CountOptions();
   for (int i = 0; i < iCount; i++) {
     if (csDV == GetOptionValue(i)) {
       return i;
@@ skipping 141 matching lines @@
 
   m_pForm->m_bUpdated = TRUE;
   return TRUE;
 }
 #endif  // PDF_ENABLE_XFA
 FX_BOOL CPDF_FormField::CheckControl(int iControlIndex,
                                      FX_BOOL bChecked,
                                      FX_BOOL bNotify) {
   ASSERT(GetType() == CheckBox || GetType() == RadioButton);
   CPDF_FormControl* pControl = GetControl(iControlIndex);
-  if (pControl == NULL) {
+  if (!pControl) {
     return FALSE;
   }
   if (!bChecked && pControl->IsChecked() == bChecked) {
     return FALSE;
   }
   CFX_ByteArray statusArray;
   if (bNotify && m_pForm->m_pFormNotify) {
     SaveCheckedFieldStatus(this, statusArray);
   }
   CFX_WideString csWExport = pControl->GetExportValue();
@@ skipping 91 matching lines @@
     }
   }
   if (bNotify && m_pForm->m_pFormNotify) {
     m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
   }
   m_pForm->m_bUpdated = TRUE;
   return TRUE;
 }
 int CPDF_FormField::GetTopVisibleIndex() {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TI");
-  if (pObj == NULL) {
+  if (!pObj) {
     return 0;
   }
   return pObj->GetInteger();
 }
 int CPDF_FormField::CountSelectedOptions() {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
-  if (pObj == NULL) {
+  if (!pObj) {
     return 0;
   }
   CPDF_Array* pArray = pObj->GetArray();
-  if (pArray == NULL) {
+  if (!pArray) {
     return 0;
   }
   return (int)pArray->GetCount();
 }
 int CPDF_FormField::GetSelectedOptionIndex(int index) {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
-  if (pObj == NULL) {
+  if (!pObj) {
     return -1;
   }
   CPDF_Array* pArray = pObj->GetArray();
-  if (pArray == NULL) {
+  if (!pArray) {
     return -1;
   }
   int iCount = (int)pArray->GetCount();
   if (iCount > 0 && index < iCount) {
     return pArray->GetInteger(index);
   }
   return -1;
 }
 FX_BOOL CPDF_FormField::IsOptionSelected(int iOptIndex) {
   CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
-  if (pObj == NULL) {
+  if (!pObj) {
     return FALSE;
   }
   CPDF_Array* pArray = pObj->GetArray();
-  if (pArray == NULL) {
+  if (!pArray) {
     return FALSE;
   }
   int iCount = (int)pArray->GetCount();
   for (int i = 0; i < iCount; i++) {
     if (pArray->GetInteger(i) == iOptIndex) {
       return TRUE;
     }
   }
   return FALSE;
 }
 FX_BOOL CPDF_FormField::SelectOption(int iOptIndex,
                                      FX_BOOL bSelected,
                                      FX_BOOL bNotify) {
   CPDF_Array* pArray = m_pDict->GetArray("I");
-  if (pArray == NULL) {
+  if (!pArray) {
     if (!bSelected) {
       return TRUE;
     }
     pArray = CPDF_Array::Create();
-    if (pArray == NULL) {
+    if (!pArray) {
       return FALSE;
     }
     m_pDict->SetAt("I", pArray);
   }
   FX_BOOL bReturn = FALSE;
   for (int i = 0; i < (int)pArray->GetCount(); i++) {
     int iFind = pArray->GetInteger(i);
     if (iFind == iOptIndex) {
       if (bSelected) {
         return TRUE;
@@ skipping 25 matching lines @@
           iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
         }
         if (GetType() == ComboBox) {
           iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
         }
         if (iRet < 0) {
           return FALSE;
         }
       }
       CPDF_Number* pNum = CPDF_Number::Create(iOptIndex);
-      if (pNum == NULL) {
+      if (!pNum) {
         return FALSE;
       }
       pArray->InsertAt(i, pNum);
       bReturn = TRUE;
       break;
     }
   }
   if (!bReturn) {
     if (bSelected) {
       pArray->AddInteger(iOptIndex);
@@ skipping 56 matching lines @@
   }
   CPDF_SimpleParser syntax(DA);
   syntax.FindTagParam("Tf", 2);
   CFX_ByteString font_name = syntax.GetWord();
   CPDF_Dictionary* pFontDict = NULL;
   if (m_pForm->m_pFormDict && m_pForm->m_pFormDict->GetDict("DR") &&
       m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font"))
     pFontDict = m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font")->GetDict(
         font_name);
 
-  if (pFontDict == NULL) {
+  if (!pFontDict) {
     return;
   }
   m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
   m_FontSize = FX_atof(syntax.GetWord());
 }