FX Bool considered harmful, part 3

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 "../../include/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
-FX_BOOL PDF_FormField_IsUnison(CPDF_FormField *pField)
+bool PDF_FormField_IsUnison(CPDF_FormField *pField)
 {
-    FX_BOOL bUnison = FALSE;
+    bool bUnison = false;
     if (pField->GetType() == CPDF_FormField::CheckBox) {
-        bUnison = TRUE;
+        bUnison = true;
     } else {
         FX_DWORD dwFlags = pField->GetFieldFlags();
         bUnison = ((dwFlags & 0x2000000) != 0);
     }
     return bUnison;
 }
 CPDF_FormField::CPDF_FormField(CPDF_InterForm* pForm, CPDF_Dictionary* pDict)
 {
     m_pDict = pDict;
     m_Type = Unknown;
@@ skipping 68 matching lines @@
         }
         LoadDA();
     } else if (type_name == "Sig") {
         m_Type = Sign;
     }
 }
 CFX_WideString CPDF_FormField::GetFullName()
 {
     return ::GetFullName(m_pDict);
 }
-FX_BOOL CPDF_FormField::ResetField(FX_BOOL bNotify)
+bool CPDF_FormField::ResetField(bool bNotify)
 {
     switch (m_Type) {
         case CPDF_FormField::CheckBox:
         case CPDF_FormField::RadioButton: {
                 CFX_ByteArray statusArray;
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     SaveCheckedFieldStatus(this, statusArray);
                 }
                 int iCount = CountControls();
                 if (iCount) {
                     if (PDF_FormField_IsUnison(this)) {
                         for(int i = 0; i < iCount; i++) {
-                            CheckControl(i, GetControl(i)->IsDefaultChecked(), FALSE);
+                            CheckControl(i, GetControl(i)->IsDefaultChecked(), false);
                         }
                     } else {
                         for (int i = 0; i < iCount; i ++) {
                             CPDF_FormControl* pControl = GetControl(i);
-                            FX_BOOL bChecked = pControl->IsDefaultChecked();
-                            CheckControl(i, bChecked, FALSE);
+                            bool bChecked = pControl->IsDefaultChecked();
+                            CheckControl(i, bChecked, false);
                         }
                     }
                 }
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
                 }
             }
             break;
         case CPDF_FormField::ComboBox: {
                 CFX_WideString csValue;
                 ClearSelection();
                 int iIndex = GetDefaultSelectedItem();
                 if (iIndex >= 0) {
                     csValue = GetOptionLabel(iIndex);
                 }
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
                     if (iRet < 0) {
-                        return FALSE;
+                        return false;
                     }
                 }
-                SetItemSelection(iIndex, TRUE);
+                SetItemSelection(iIndex, true);
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     m_pForm->m_pFormNotify->AfterValueChange(this);
                 }
             }
             break;
         case CPDF_FormField::ListBox: {
                 CFX_WideString csValue;
                 ClearSelection();
                 int iIndex = GetDefaultSelectedItem();
                 if (iIndex >= 0) {
                     csValue = GetOptionLabel(iIndex);
                 }
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     int iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
                     if (iRet < 0) {
-                        return FALSE;
+                        return false;
                     }
                 }
-                SetItemSelection(iIndex, TRUE);
+                SetItemSelection(iIndex, true);
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     m_pForm->m_pFormNotify->AfterSelectionChange(this);
                 }
             }
             break;
         case CPDF_FormField::Text:
         case CPDF_FormField::RichText:
         case CPDF_FormField::File:
         default: {
                 CPDF_Object* pDV = FPDF_GetFieldAttr(m_pDict, "DV");
                 CFX_WideString csDValue;
                 if (pDV != NULL) {
                     csDValue = pDV->GetUnicodeText();
                 }
                 CPDF_Object* pV = FPDF_GetFieldAttr(m_pDict, "V");
                 CFX_WideString csValue;
                 if (pV != NULL) {
                     csValue = pV->GetUnicodeText();
                 }
                 CPDF_Object* pRV = FPDF_GetFieldAttr(m_pDict, "RV");
                 if (!pRV && (csDValue == csValue)) {
-                    return FALSE;
+                    return false;
                 }
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csDValue);
                     if (iRet < 0) {
-                        return FALSE;
+                        return false;
                     }
                 }
                 if (pDV == NULL) {
                     m_pDict->RemoveAt("V");
                     m_pDict->RemoveAt("RV");
                 } else {
                     CPDF_Object* pClone = pDV->Clone();
                     if (pClone == NULL) {
-                        return FALSE;
+                        return false;
                     }
                     m_pDict->SetAt("V", pClone);
                     if(pRV) {
                         CPDF_Object* pCloneR = pDV->Clone();
                         m_pDict->SetAt("RV", pCloneR);
                     }
                 }
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     m_pForm->m_pFormNotify->AfterValueChange(this);
                 }
-                m_pForm->m_bUpdated = TRUE;
+                m_pForm->m_bUpdated = true;
             }
             break;
     }
-    return TRUE;
+    return true;
 }
 int CPDF_FormField::GetControlIndex(const CPDF_FormControl* pControl)
 {
     if (pControl == NULL) {
         return -1;
     }
     int iCount = m_ControlList.GetSize();
     for (int i = 0; i < iCount; i ++) {
         CPDF_FormControl* pFind = (CPDF_FormControl*)m_ControlList.GetAt(i);
         if (pFind == pControl) {
@@ skipping 67 matching lines @@
     return pObj->GetString();
 }
 CFX_WideString CPDF_FormField::GetRichTextString()
 {
     CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "RV");
     if (pObj == NULL) {
         return L"";
     }
     return pObj->GetUnicodeText();
 }
-CFX_WideString CPDF_FormField::GetValue(FX_BOOL bDefault)
+CFX_WideString CPDF_FormField::GetValue(bool bDefault)
 {
     if (GetType() == CheckBox || GetType() == RadioButton) {
         return GetCheckValue(bDefault);
     }
     CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, bDefault ? "DV" : "V");
     if (pValue == NULL) {
         if (!bDefault) {
             if (m_Type == RichText) {
                 pValue = FPDF_GetFieldAttr(m_pDict, "V");
             }
@@ skipping 13 matching lines @@
             pValue = ((CPDF_Array*)pValue)->GetElementValue(0);
             if (pValue) {
                 return pValue->GetUnicodeText();
             }
             break;
     }
     return CFX_WideString();
 }
 CFX_WideString CPDF_FormField::GetValue()
 {
-    return GetValue(FALSE);
+    return GetValue(false);
 }
 CFX_WideString CPDF_FormField::GetDefaultValue()
 {
-    return GetValue(TRUE);
+    return GetValue(true);
 }
-FX_BOOL CPDF_FormField::SetValue(const CFX_WideString& value, FX_BOOL bDefault, FX_BOOL bNotify)
+bool CPDF_FormField::SetValue(const CFX_WideString& value, bool bDefault, bool bNotify)
 {
     switch (m_Type) {
         case CheckBox:
         case RadioButton: {
                 SetCheckValue(value, bDefault, bNotify);
-                return TRUE;
+                return true;
             }
         case File:
         case RichText:
         case Text:
         case ComboBox: {
                 CFX_WideString csValue = value;
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     int iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
                     if (iRet < 0) {
-                        return FALSE;
+                        return false;
                     }
                 }
                 int iIndex = FindOptionValue(csValue);
                 if (iIndex < 0) {
                     CFX_ByteString bsEncodeText = PDF_EncodeText(csValue);
                     m_pDict->SetAtString(bDefault ? "DV" : "V", bsEncodeText);
                     if (m_Type == RichText && !bDefault) {
                         m_pDict->SetAtString("RV", bsEncodeText);
                     }
                     m_pDict->RemoveAt("I");
                 } else {
                     m_pDict->SetAtString(bDefault ? "DV" : "V", PDF_EncodeText(csValue));
                     if (bDefault) {
                     } else {
                         ClearSelection();
-                        SetItemSelection(iIndex, TRUE);
+                        SetItemSelection(iIndex, true);
                     }
                 }
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     m_pForm->m_pFormNotify->AfterValueChange(this);
                 }
-                m_pForm->m_bUpdated = TRUE;
+                m_pForm->m_bUpdated = true;
             }
             break;
         case ListBox: {
                 int iIndex = FindOptionValue(value);
                 if (iIndex < 0) {
-                    return FALSE;
+                    return false;
                 }
                 if (bDefault && iIndex == GetDefaultSelectedItem()) {
-                    return FALSE;
+                    return false;
                 }
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     CFX_WideString csValue = value;
                     int iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
                     if (iRet < 0) {
-                        return FALSE;
+                        return false;
                     }
                 }
                 if (bDefault) {
                 } else {
                     ClearSelection();
-                    SetItemSelection(iIndex, TRUE);
+                    SetItemSelection(iIndex, true);
                 }
                 if (bNotify && m_pForm->m_pFormNotify != NULL) {
                     m_pForm->m_pFormNotify->AfterSelectionChange(this);
                 }
-                m_pForm->m_bUpdated = TRUE;
+                m_pForm->m_bUpdated = true;
                 break;
             }
         default:
             break;
     }
     if (CPDF_InterForm::m_bUpdateAP) {
         UpdateAP(NULL);
     }
-    return TRUE;
+    return true;
 }
-FX_BOOL CPDF_FormField::SetValue(const CFX_WideString& value, FX_BOOL bNotify)
+bool CPDF_FormField::SetValue(const CFX_WideString& value, bool bNotify)
 {
-    return SetValue(value, FALSE, bNotify);
+    return SetValue(value, false, bNotify);
 }
 int CPDF_FormField::GetMaxLen()
 {
     CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "MaxLen");
     if (pObj == NULL) {
         int iCount = m_ControlList.GetSize();
         for (int i = 0; i < iCount; i ++) {
             CPDF_FormControl* pControl = (CPDF_FormControl*)m_ControlList.GetAt(i);
             if (pControl == NULL) {
                 continue;
@@ skipping 69 matching lines @@
         }
     }
     int nOpts = CountOptions();
     for (int i = 0; i < nOpts; i ++) {
         if (sel_value == GetOptionValue(i)) {
             return i;
         }
     }
     return -1;
 }
-FX_BOOL CPDF_FormField::ClearSelection(FX_BOOL bNotify)
+bool CPDF_FormField::ClearSelection(bool bNotify)
 {
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         int iRet = 0;
         CFX_WideString csValue;
         int iIndex = GetSelectedIndex(0);
         if (iIndex >= 0) {
             csValue = GetOptionLabel(iIndex);
         }
         if (GetType() == ListBox) {
             iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
         }
         if (GetType() == ComboBox) {
             iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
         }
         if (iRet < 0) {
-            return FALSE;
+            return false;
         }
     }
     m_pDict->RemoveAt("V");
     m_pDict->RemoveAt("I");
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         if (GetType() == ListBox) {
             m_pForm->m_pFormNotify->AfterSelectionChange(this);
         }
         if (GetType() == ComboBox) {
             m_pForm->m_pFormNotify->AfterValueChange(this);
         }
     }
     if (CPDF_InterForm::m_bUpdateAP) {
         UpdateAP(NULL);
     }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+    m_pForm->m_bUpdated = true;
+    return true;
 }
-FX_BOOL CPDF_FormField::IsItemSelected(int index)
+bool CPDF_FormField::IsItemSelected(int index)
 {
     ASSERT(GetType() == ComboBox || GetType() == ListBox);
     if (index < 0 || index >= CountOptions()) {
-        return FALSE;
+        return false;
     }
     if (IsOptionSelected(index)) {
-        return TRUE;
+        return true;
     }
     CFX_WideString opt_value = GetOptionValue(index);
     CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
     if (pValue == NULL) {
         pValue = FPDF_GetFieldAttr(m_pDict, "I");
         if (pValue == NULL) {
-            return FALSE;
+            return false;
         }
     }
     if (pValue->GetType() == PDFOBJ_STRING) {
         if (pValue->GetUnicodeText() == opt_value) {
-            return TRUE;
+            return true;
         }
-        return FALSE;
+        return false;
     }
     if (pValue->GetType() == PDFOBJ_NUMBER) {
         if (pValue->GetString().IsEmpty()) {
-            return FALSE;
+            return false;
         }
         if (pValue->GetInteger() == index) {
-            return TRUE;
+            return true;
         }
-        return FALSE;
+        return false;
     }
     if (pValue->GetType() != PDFOBJ_ARRAY) {
-        return FALSE;
+        return false;
     }
     CPDF_Array* pArray = (CPDF_Array*)pValue;
     int iPos = -1;
     for (int j = 0; j < CountSelectedOptions(); j ++) {
         if (GetSelectedOptionIndex(j) == index) {
             iPos = j;
             break;
         }
     }
     for (FX_DWORD i = 0; i < pArray->GetCount(); i ++)
         if (pArray->GetElementValue(i)->GetUnicodeText() == opt_value && (int)i == iPos) {
-            return TRUE;
+            return true;
         }
-    return FALSE;
+    return false;
 }
-FX_BOOL CPDF_FormField::SetItemSelection(int index, FX_BOOL bSelected, FX_BOOL bNotify)
+bool CPDF_FormField::SetItemSelection(int index, bool bSelected, bool bNotify)
 {
     ASSERT(GetType() == ComboBox || GetType() == ListBox);
     if (index < 0 || index >= CountOptions()) {
-        return FALSE;
+        return false;
     }
     CFX_WideString opt_value = GetOptionValue(index);
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         int iRet = 0;
         if (GetType() == ListBox) {
             iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, opt_value);
         }
         if (GetType() == ComboBox) {
             iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, opt_value);
         }
         if (iRet < 0) {
-            return FALSE;
+            return false;
         }
     }
     if (!bSelected) {
         CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
         if (pValue != NULL) {
             if (m_Type == ListBox) {
-                SelectOption(index, FALSE);
+                SelectOption(index, false);
                 if (pValue->GetType() == PDFOBJ_STRING) {
                     if (pValue->GetUnicodeText() == opt_value) {
                         m_pDict->RemoveAt("V");
                     }
                 } else if (pValue->GetType() == PDFOBJ_ARRAY) {
                     CPDF_Array* pArray = CPDF_Array::Create();
                     if (pArray == NULL) {
-                        return FALSE;
+                        return false;
                     }
                     int iCount = CountOptions();
                     for (int i = 0; i < iCount; i ++) {
                         if (i != index) {
                             if (IsItemSelected(i)) {
                                 opt_value = GetOptionValue(i);
                                 pArray->AddString(PDF_EncodeText(opt_value));
                             }
                         }
                     }
                     if (pArray->GetCount() < 1) {
                         pArray->Release();
                     } else {
                         m_pDict->SetAt("V", pArray);
                     }
                 }
             } else if (m_Type == ComboBox) {
                 m_pDict->RemoveAt("V");
                 m_pDict->RemoveAt("I");
             }
         }
     } else {
         if (m_Type == ListBox) {
-            SelectOption(index, TRUE);
+            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) {
-                    return FALSE;
+                    return false;
                 }
-                FX_BOOL bSelected;
+                bool bSelected;
                 int iCount = CountOptions();
                 for (int i = 0; i < iCount; i ++) {
                     if (i != index) {
                         bSelected = IsItemSelected(i);
                     } else {
-                        bSelected = TRUE;
+                        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) {
-                return FALSE;
+                return false;
             }
             pI->AddInteger(index);
             m_pDict->SetAt("I", pI);
         }
     }
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         if (GetType() == ListBox) {
             m_pForm->m_pFormNotify->AfterSelectionChange(this);
         }
         if (GetType() == ComboBox) {
             m_pForm->m_pFormNotify->AfterValueChange(this);
         }
     }
     if (CPDF_InterForm::m_bUpdateAP) {
         UpdateAP(NULL);
     }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+    m_pForm->m_bUpdated = true;
+    return true;
 }
-FX_BOOL CPDF_FormField::IsItemDefaultSelected(int index)
+bool CPDF_FormField::IsItemDefaultSelected(int index)
 {
     ASSERT(GetType() == ComboBox || GetType() == ListBox);
     if (index < 0 || index >= CountOptions()) {
-        return FALSE;
+        return false;
     }
     int iDVIndex = GetDefaultSelectedItem();
     if (iDVIndex < 0) {
-        return FALSE;
+        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) {
         return -1;
     }
@@ skipping 77 matching lines @@
     }
     int iCount = CountOptions();
     for (; iStartIndex < iCount; iStartIndex ++) {
         CFX_WideString csValue = GetOptionValue(iStartIndex);
         if (csValue == csOptValue) {
             return iStartIndex;
         }
     }
     return -1;
 }
-FX_BOOL CPDF_FormField::CheckControl(int iControlIndex, FX_BOOL bChecked, FX_BOOL bNotify)
+bool CPDF_FormField::CheckControl(int iControlIndex, bool bChecked, bool bNotify)
 {
     ASSERT(GetType() == CheckBox || GetType() == RadioButton);
     CPDF_FormControl* pControl = GetControl(iControlIndex);
     if (pControl == NULL) {
-        return FALSE;
+        return false;
     }
     if (!bChecked && pControl->IsChecked() == bChecked) {
-        return FALSE;
+        return false;
     }
     CFX_ByteArray statusArray;
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         SaveCheckedFieldStatus(this, statusArray);
     }
     CFX_WideString csWExport = pControl->GetExportValue();
     CFX_ByteString csBExport = PDF_EncodeText(csWExport);
     int iCount = CountControls();
-    FX_BOOL bUnison = PDF_FormField_IsUnison(this);
+    bool bUnison = PDF_FormField_IsUnison(this);
     for (int i = 0; i < iCount; i ++) {
         CPDF_FormControl* pCtrl = GetControl(i);
         if (bUnison) {
             CFX_WideString csEValue = pCtrl->GetExportValue();
             if (csEValue == csWExport) {
                 if (pCtrl->GetOnStateName() == pControl->GetOnStateName()) {
                     pCtrl->CheckControl(bChecked);
                 } else if (bChecked) {
-                    pCtrl->CheckControl(FALSE);
+                    pCtrl->CheckControl(false);
                 }
             } else if (bChecked) {
-                pCtrl->CheckControl(FALSE);
+                pCtrl->CheckControl(false);
             }
         } else {
             if (i == iControlIndex) {
                 pCtrl->CheckControl(bChecked);
             } else if (bChecked) {
-                pCtrl->CheckControl(FALSE);
+                pCtrl->CheckControl(false);
             }
         }
     }
     CPDF_Object* pOpt = FPDF_GetFieldAttr(m_pDict, "Opt");
     if (pOpt == NULL || pOpt->GetType() != PDFOBJ_ARRAY) {
         if (bChecked) {
             m_pDict->SetAtName("V", csBExport);
         } else {
             CFX_ByteString csV;
             CPDF_Object* pV = FPDF_GetFieldAttr(m_pDict, "V");
             if (pV != NULL) {
                 csV = pV->GetString();
             }
             if (csV == csBExport) {
                 m_pDict->SetAtName("V", "Off");
             }
         }
     } else if (bChecked) {
         CFX_ByteString csIndex;
         csIndex.Format("%d", iControlIndex);
         m_pDict->SetAtName("V", csIndex);
     }
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
     }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+    m_pForm->m_bUpdated = true;
+    return true;
 }
-CFX_WideString CPDF_FormField::GetCheckValue(FX_BOOL bDefault)
+CFX_WideString CPDF_FormField::GetCheckValue(bool bDefault)
 {
     ASSERT(GetType() == CheckBox || GetType() == RadioButton);
     CFX_WideString csExport = L"Off";
-    FX_BOOL bChecked;
+    bool bChecked;
     int iCount = CountControls();
     for (int i = 0; i < iCount; i ++) {
         CPDF_FormControl* pControl = GetControl(i);
         if (bDefault) {
             bChecked = pControl->IsDefaultChecked();
         } else {
             bChecked = pControl->IsChecked();
         }
         if (bChecked) {
             csExport = pControl->GetExportValue();
             break;
         }
     }
     return csExport;
 }
-FX_BOOL CPDF_FormField::SetCheckValue(const CFX_WideString& value, FX_BOOL bDefault, FX_BOOL bNotify)
+bool CPDF_FormField::SetCheckValue(const CFX_WideString& value, bool bDefault, bool bNotify)
 {
     ASSERT(GetType() == CheckBox || GetType() == RadioButton);
     CFX_ByteArray statusArray;
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         SaveCheckedFieldStatus(this, statusArray);
     }
     int iCount = CountControls();
     for (int i = 0; i < iCount; i ++) {
         CPDF_FormControl* pControl = GetControl(i);
         CFX_WideString csExport = pControl->GetExportValue();
         if (csExport == value) {
             if (bDefault) {
             } else {
-                CheckControl(GetControlIndex(pControl), TRUE);
+                CheckControl(GetControlIndex(pControl), true);
             }
             break;
         } else {
             if (bDefault) {
             } else {
-                CheckControl(GetControlIndex(pControl), FALSE);
+                CheckControl(GetControlIndex(pControl), false);
             }
         }
     }
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         m_pForm->m_pFormNotify->AfterCheckedStatusChange(this, statusArray);
     }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+    m_pForm->m_bUpdated = true;
+    return true;
 }
 int CPDF_FormField::GetTopVisibleIndex()
 {
     CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "TI");
     if (pObj == NULL) {
         return 0;
     }
     return pObj->GetInteger();
 }
 int CPDF_FormField::CountSelectedOptions()
@@ skipping 17 matching lines @@
     CPDF_Array* pArray = pObj->GetArray();
     if (pArray == NULL) {
         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)
+bool CPDF_FormField::IsOptionSelected(int iOptIndex)
 {
     CPDF_Object* pObj = FPDF_GetFieldAttr(m_pDict, "I");
     if (pObj == NULL) {
-        return FALSE;
+        return false;
     }
     CPDF_Array* pArray = pObj->GetArray();
     if (pArray == NULL) {
-        return FALSE;
+        return false;
     }
     int iCount = (int)pArray->GetCount();
     for (int i = 0; i < iCount; i ++) {
         if (pArray->GetInteger(i) == iOptIndex) {
-            return TRUE;
+            return true;
         }
     }
-    return FALSE;
+    return false;
 }
-FX_BOOL CPDF_FormField::SelectOption(int iOptIndex, FX_BOOL bSelected, FX_BOOL bNotify)
+bool CPDF_FormField::SelectOption(int iOptIndex, bool bSelected, bool bNotify)
 {
     CPDF_Array* pArray = m_pDict->GetArray("I");
     if (pArray == NULL) {
         if (!bSelected) {
-            return TRUE;
+            return true;
         }
         pArray = CPDF_Array::Create();
         if (pArray == NULL) {
-            return FALSE;
+            return false;
         }
         m_pDict->SetAt("I", pArray);
     }
-    FX_BOOL bReturn = FALSE;
+    bool bReturn = false;
     for (int i = 0; i < (int)pArray->GetCount(); i ++) {
         int iFind = pArray->GetInteger(i);
         if (iFind == iOptIndex) {
             if (bSelected) {
-                return TRUE;
+                return true;
             }
             if (bNotify && m_pForm->m_pFormNotify != NULL) {
                 int iRet = 0;
                 CFX_WideString csValue = GetOptionLabel(iOptIndex);
                 if (GetType() == ListBox) {
                     iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
                 }
                 if (GetType() == ComboBox) {
                     iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
                 }
                 if (iRet < 0) {
-                    return FALSE;
+                    return false;
                 }
             }
             pArray->RemoveAt(i);
-            bReturn = TRUE;
+            bReturn = true;
             break;
         } else if (iFind > iOptIndex) {
             if (!bSelected) {
                 continue;
             }
             if (bNotify && m_pForm->m_pFormNotify != NULL) {
                 int iRet = 0;
                 CFX_WideString csValue = GetOptionLabel(iOptIndex);
                 if (GetType() == ListBox) {
                     iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
                 }
                 if (GetType() == ComboBox) {
                     iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
                 }
                 if (iRet < 0) {
-                    return FALSE;
+                    return false;
                 }
             }
             CPDF_Number* pNum = CPDF_Number::Create(iOptIndex);
             if (pNum == NULL) {
-                return FALSE;
+                return false;
             }
             pArray->InsertAt(i, pNum);
-            bReturn = TRUE;
+            bReturn = true;
             break;
         }
     }
     if (!bReturn) {
         if (bSelected) {
             pArray->AddInteger(iOptIndex);
         }
         if (pArray->GetCount() == 0) {
             m_pDict->RemoveAt("I");
         }
     }
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         if (GetType() == ListBox) {
             m_pForm->m_pFormNotify->AfterSelectionChange(this);
         }
         if (GetType() == ComboBox) {
             m_pForm->m_pFormNotify->AfterValueChange(this);
         }
     }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+    m_pForm->m_bUpdated = true;
+    return true;
 }
-FX_BOOL CPDF_FormField::ClearSelectedOptions(FX_BOOL bNotify)
+bool CPDF_FormField::ClearSelectedOptions(bool bNotify)
 {
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         int iRet = 0;
         CFX_WideString csValue;
         int iIndex = GetSelectedIndex(0);
         if (iIndex >= 0) {
             csValue = GetOptionLabel(iIndex);
         }
         if (GetType() == ListBox) {
             iRet = m_pForm->m_pFormNotify->BeforeSelectionChange(this, csValue);
         }
         if (GetType() == ComboBox) {
             iRet = m_pForm->m_pFormNotify->BeforeValueChange(this, csValue);
         }
         if (iRet < 0) {
-            return FALSE;
+            return false;
         }
     }
     m_pDict->RemoveAt("I");
     if (bNotify && m_pForm->m_pFormNotify != NULL) {
         if (GetType() == ListBox) {
             m_pForm->m_pFormNotify->AfterSelectionChange(this);
         }
         if (GetType() == ComboBox) {
             m_pForm->m_pFormNotify->AfterValueChange(this);
         }
     }
-    m_pForm->m_bUpdated = TRUE;
-    return TRUE;
+    m_pForm->m_bUpdated = true;
+    return true;
 }
 void CPDF_FormField::LoadDA()
 {
     CFX_ByteString DA;
     if (CPDF_Object* pObj_t = FPDF_GetFieldAttr(m_pDict, "DA")) {
         DA = pObj_t->GetString();
     }
     if (DA.IsEmpty() && m_pForm->m_pFormDict) {
         DA = m_pForm->m_pFormDict->GetString("DA");
     }
     if (DA.IsEmpty()) {
         return;
     }
     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) {
         return;
     }
     m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
     m_FontSize = FX_atof(syntax.GetWord());
 }