FX_BOOL considered harmful, part 2.

fpdfsdk/src/fpdfformfill.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 "../../public/fpdf_formfill.h"
 #include "../../public/fpdfview.h"
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
@@ skipping 10 matching lines @@
 
 CPDFSDK_InterForm* FormHandleToInterForm(FPDF_FORMHANDLE hHandle)
 {
     CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
     return pSDKDoc ? pSDKDoc->GetInterForm() : nullptr;
 }
 
 CPDFSDK_PageView* FormHandleToPageView(FPDF_FORMHANDLE hHandle, FPDF_PAGE page)
 {
     CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
-    return pSDKDoc ? pSDKDoc->GetPageView((CPDF_Page*)page, TRUE) : nullptr;
+    return pSDKDoc ? pSDKDoc->GetPageView((CPDF_Page*)page, true) : nullptr;
 }
 
 }  // namespace
 
 DLLEXPORT int STDCALL FPDPage_HasFormFieldAtPoint(
     FPDF_FORMHANDLE hHandle, FPDF_PAGE page, double page_x, double page_y)
 {
     if (!page || !hHandle)
         return -1;
     CPDF_Page* pPage = (CPDF_Page*) page;
 
     nonstd::unique_ptr<CPDF_InterForm> pInterForm(
-        new CPDF_InterForm(pPage->m_pDocument, FALSE));
+        new CPDF_InterForm(pPage->m_pDocument, false));
     CPDF_FormControl* pFormCtrl = pInterForm->GetControlAtPoint(
         pPage, (FX_FLOAT)page_x, (FX_FLOAT)page_y);
     if (!pFormCtrl)
         return -1;
 
     CPDF_FormField* pFormField = pFormCtrl->GetField();
     if(!pFormField)
         return -1;
 
     return pFormField->GetFieldType();
@@ skipping 22 matching lines @@
         pEnv->SetSDKDocument(NULL);
         delete pSDKDoc;
     }
     delete pEnv;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnMouseMove(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int modifier, double page_x, double page_y)
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
     return pPageView->OnMouseMove(pt, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnLButtonDown(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int modifier, double page_x, double page_y)
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
     return pPageView->OnLButtonDown(pt, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnLButtonUp(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int modifier, double page_x, double page_y)
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     CPDF_Point pt((FX_FLOAT)page_x, (FX_FLOAT)page_y);
     return pPageView->OnLButtonUp(pt, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnKeyDown(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int nKeyCode, int modifier)
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     return pPageView->OnKeyDown(nKeyCode, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnKeyUp(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int nKeyCode, int modifier)
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     return pPageView->OnKeyUp(nKeyCode, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_OnChar(FPDF_FORMHANDLE hHandle, FPDF_PAGE page, int nChar,  int modifier)
 {
     CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page);
     if (!pPageView)
-        return FALSE;
+        return false;
 
     return pPageView->OnChar(nChar, modifier);
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FORM_ForceToKillFocus(FPDF_FORMHANDLE hHandle)
 {
     CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
     if (!pSDKDoc)
-        return FALSE;
+        return false;
 
     return pSDKDoc->KillFocusAnnot(0);
 }
 
 DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle, FPDF_BITMAP bitmap, FPDF_PAGE page,
                                     int start_x, int start_y, int size_x, int size_y, int rotate, int flags)
 {
     if (!hHandle || !page)
         return;
 
@@ skipping 54 matching lines @@
 
 DLLEXPORT void STDCALL FPDF_RemoveFormFieldHighlight(FPDF_FORMHANDLE hHandle)
 {
     if (CPDFSDK_InterForm* pInterForm = FormHandleToInterForm(hHandle))
         pInterForm->RemoveAllHighLight();
 }
 
 DLLEXPORT void STDCALL FORM_OnAfterLoadPage(FPDF_PAGE page, FPDF_FORMHANDLE hHandle)
 {
     if (CPDFSDK_PageView* pPageView = FormHandleToPageView(hHandle, page))
-        pPageView->SetValid(TRUE);
+        pPageView->SetValid(true);
 }
 
 DLLEXPORT void STDCALL FORM_OnBeforeClosePage(FPDF_PAGE page, FPDF_FORMHANDLE hHandle)
 {
     if (!hHandle || !page)
         return;
 
     CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetSDKDocument();
     if (!pSDKDoc)
         return;
 
     CPDF_Page* pPage = (CPDF_Page*)page;
-    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
+    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, false);
     if (pPageView)
     {
-        pPageView->SetValid(FALSE);
+        pPageView->SetValid(false);
         // ReMovePageView() takes care of the delete for us.
         pSDKDoc->ReMovePageView(pPage);
     }
 }
 
 DLLEXPORT void STDCALL FORM_DoDocumentJSAction(FPDF_FORMHANDLE hHandle)
 {
     CPDFSDK_Document* pSDKDoc = FormHandleToSDKDoc(hHandle);
     if (pSDKDoc && ((CPDFDoc_Environment*)hHandle)->IsJSInitiated())
         pSDKDoc->ProcJavascriptFun();
@@ skipping 26 matching lines @@
         pActionHandler->DoAction_Document(action, (CPDF_AAction::AActionType)aaType, pSDKDoc);
     }
 }
 
 DLLEXPORT void STDCALL FORM_DoPageAAction(FPDF_PAGE page, FPDF_FORMHANDLE hHandle, int aaType)
 {
     if(!hHandle || !page)
         return;
     CPDFSDK_Document* pSDKDoc = ((CPDFDoc_Environment*)hHandle)->GetSDKDocument();
     CPDF_Page* pPage = (CPDF_Page*)page;
-    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, FALSE);
+    CPDFSDK_PageView* pPageView = pSDKDoc->GetPageView(pPage, false);
     if(pPageView)
     {
         CPDFDoc_Environment *pEnv = pSDKDoc->GetEnv();
         ASSERT(pEnv != NULL);
 
         CPDFSDK_ActionHandler *pActionHandler = pEnv->GetActionHander();
         ASSERT(pActionHandler != NULL);
 
         CPDF_Dictionary *pPageDict = pPage->m_pFormDict;
         ASSERT(pPageDict != NULL);
 
         CPDF_AAction aa = pPageDict->GetDict(FX_BSTRC("AA"));
 
-        FX_BOOL bExistOAAction = FALSE;
-        FX_BOOL bExistCAAction = FALSE;
+        bool bExistOAAction = false;
+        bool bExistCAAction = false;
         if (FPDFPAGE_AACTION_OPEN == aaType)
         {
             bExistOAAction = aa.ActionExist(CPDF_AAction::OpenPage);
             if (bExistOAAction)
             {
                 CPDF_Action action = aa.GetAction(CPDF_AAction::OpenPage);
                 pActionHandler->DoAction_Page(action, CPDF_AAction::OpenPage, pSDKDoc);
             }
         }
         else
         {
             bExistCAAction = aa.ActionExist(CPDF_AAction::ClosePage);
             if (bExistCAAction)
             {
                 CPDF_Action action = aa.GetAction(CPDF_AAction::ClosePage);
                 pActionHandler->DoAction_Page(action, CPDF_AAction::ClosePage, pSDKDoc);
             }
         }
     }
 }