1 files changed, 16 insertions, 24 deletions

diff --git a/core/fpdfdoc/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h
index abdd6f78b9..37f17c3a8a 100644
--- a/core/fpdfdoc/cpdf_formfield.h
+++ b/core/fpdfdoc/cpdf_formfield.h
@@ -56,7 +56,7 @@ class CPDF_FormField {
   CPDF_Dictionary* GetFieldDict() const { return m_pDict; }
   void SetFieldDict(CPDF_Dictionary* pDict) { m_pDict = pDict; }
 
-  FX_BOOL ResetField(FX_BOOL bNotify = FALSE);
+  bool ResetField(bool bNotify = false);
 
   int CountControls() const { return m_ControlList.GetSize(); }
 
@@ -77,19 +77,17 @@ class CPDF_FormField {
 
   CFX_WideString GetValue() const;
   CFX_WideString GetDefaultValue() const;
-  FX_BOOL SetValue(const CFX_WideString& value, FX_BOOL bNotify = FALSE);
+  bool SetValue(const CFX_WideString& value, bool bNotify = false);
 
   int GetMaxLen() const;
   int CountSelectedItems() const;
   int GetSelectedIndex(int index) const;
 
-  FX_BOOL ClearSelection(FX_BOOL bNotify = FALSE);
-  FX_BOOL IsItemSelected(int index) const;
-  FX_BOOL SetItemSelection(int index,
-                           FX_BOOL bSelected,
-                           FX_BOOL bNotify = FALSE);
+  bool ClearSelection(bool bNotify = false);
+  bool IsItemSelected(int index) const;
+  bool SetItemSelection(int index, bool bSelected, bool bNotify = false);
 
-  FX_BOOL IsItemDefaultSelected(int index) const;
+  bool IsItemDefaultSelected(int index) const;
 
   int GetDefaultSelectedItem() const;
   int CountOptions() const;
@@ -100,26 +98,24 @@ class CPDF_FormField {
   int FindOption(CFX_WideString csOptLabel) const;
   int FindOptionValue(const CFX_WideString& csOptValue) const;
 
-  FX_BOOL CheckControl(int iControlIndex, bool bChecked, bool bNotify = false);
+  bool CheckControl(int iControlIndex, bool bChecked, bool bNotify = false);
 
   int GetTopVisibleIndex() const;
   int CountSelectedOptions() const;
 
   int GetSelectedOptionIndex(int index) const;
-  FX_BOOL IsOptionSelected(int iOptIndex) const;
+  bool IsOptionSelected(int iOptIndex) const;
 
-  FX_BOOL SelectOption(int iOptIndex,
-                       FX_BOOL bSelected,
-                       FX_BOOL bNotify = FALSE);
+  bool SelectOption(int iOptIndex, bool bSelected, bool bNotify = false);
 
-  FX_BOOL ClearSelectedOptions(FX_BOOL bNotify = FALSE);
+  bool ClearSelectedOptions(bool bNotify = false);
 
 #ifdef PDF_ENABLE_XFA
-  FX_BOOL ClearOptions(FX_BOOL bNotify = FALSE);
+  bool ClearOptions(bool bNotify = false);
 
   int InsertOption(CFX_WideString csOptLabel,
                    int index = -1,
-                   FX_BOOL bNotify = FALSE);
+                   bool bNotify = false);
 #endif  // PDF_ENABLE_XFA
 
   FX_FLOAT GetFontSize() const { return m_FontSize; }
@@ -132,20 +128,16 @@ class CPDF_FormField {
   CPDF_FormField(CPDF_InterForm* pForm, CPDF_Dictionary* pDict);
   ~CPDF_FormField();
 
-  CFX_WideString GetValue(FX_BOOL bDefault) const;
-  FX_BOOL SetValue(const CFX_WideString& value,
-                   FX_BOOL bDefault,
-                   FX_BOOL bNotify);
+  CFX_WideString GetValue(bool bDefault) const;
+  bool SetValue(const CFX_WideString& value, bool bDefault, bool bNotify);
 
   void SyncFieldFlags();
   int FindListSel(CPDF_String* str);
   CFX_WideString GetOptionText(int index, int sub_index) const;
 
   void LoadDA();
-  CFX_WideString GetCheckValue(FX_BOOL bDefault) const;
-  FX_BOOL SetCheckValue(const CFX_WideString& value,
-                        FX_BOOL bDefault,
-                        FX_BOOL bNotify);
+  CFX_WideString GetCheckValue(bool bDefault) const;
+  bool SetCheckValue(const CFX_WideString& value, bool bDefault, bool bNotify);
 
   bool NotifyBeforeSelectionChange(const CFX_WideString& value);
   void NotifyAfterSelectionChange();