FX_BOOL considered harmful.

fpdfsdk/src/javascript/Document.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/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 27 matching lines @@
 END_JS_STATIC_PROP()
 
 BEGIN_JS_STATIC_METHOD(CJS_PrintParamsObj)
 END_JS_STATIC_METHOD()
 
 IMPLEMENT_JS_CLASS(CJS_PrintParamsObj, PrintParamsObj)
 
 PrintParamsObj::PrintParamsObj(CJS_Object* pJSObject)
 : CJS_EmbedObj(pJSObject)
 {
-        bUI = TRUE;
+        bUI = true;
         nStart = 0;
         nEnd = 0;
-        bSilent = FALSE;
-        bShrinkToFit = FALSE;
-        bPrintAsImage = FALSE;
-        bReverse = FALSE;
-        bAnnotations = TRUE;
+        bSilent = false;
+        bShrinkToFit = false;
+        bPrintAsImage = false;
+        bReverse = false;
+        bAnnotations = true;
 }
 
 /* ---------------------- Document ---------------------- */
 
 #define MINWIDTH  5.0f
 #define MINHEIGHT 5.0f
 
 BEGIN_JS_STATIC_CONST(CJS_Document)
 END_JS_STATIC_CONST()
 
@@ skipping 69 matching lines @@
         JS_STATIC_METHOD_ENTRY(replacePages)
         JS_STATIC_METHOD_ENTRY(resetForm)
         JS_STATIC_METHOD_ENTRY(removeIcon)
         JS_STATIC_METHOD_ENTRY(saveAs)
         JS_STATIC_METHOD_ENTRY(submitForm)
         JS_STATIC_METHOD_ENTRY(mailDoc)
 END_JS_STATIC_METHOD()
 
 IMPLEMENT_JS_CLASS(CJS_Document, Document)
 
-FX_BOOL CJS_Document::InitInstance(IFXJS_Context* cc)
+bool    CJS_Document::InitInstance(IFXJS_Context* cc)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
 
         Document* pDoc = (Document*)GetEmbedObject();
         ASSERT(pDoc != NULL);
 
         pDoc->AttachDoc(pContext->GetReaderDocument());
         pDoc->SetIsolate(pContext->GetJSRuntime()->GetIsolate());
-        return TRUE;
+        return true;
 };
 
 /* --------------------------------- Document --------------------------------- */
 
 Document::Document(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject),
         m_isolate(NULL),
         m_pIconTree(NULL),
         m_pDocument(NULL),
         m_cwBaseURL(L""),
-        m_bDelay(FALSE)
+        m_bDelay(false)
 {
 }
 
 Document::~Document()
 {
         if (m_pIconTree)
         {
                 m_pIconTree->DeleteIconTree();
                 delete m_pIconTree;
                 m_pIconTree = NULL;
         }
         for (int i=0; i<m_DelayData.GetSize(); i++)
         {
                 if (CJS_DelayData* pData = m_DelayData.GetAt(i))
                 {
                         delete pData;
                         pData = NULL;
                         m_DelayData.SetAt(i, NULL);
 
                 }
         }
 
         m_DelayData.RemoveAll();
         m_DelayAnnotData.RemoveAll();
 }
 
 //the total number of fileds in document.
-FX_BOOL Document::numFields(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::numFields(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting()) {
                 CJS_Context* pContext = static_cast<CJS_Context*>(cc);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
-                return FALSE;
+                return false;
         }
         CPDFSDK_InterForm *pInterForm = m_pDocument->GetInterForm();
         CPDF_InterForm *pPDFForm = pInterForm->GetInterForm();
         vp << (int)pPDFForm->CountFields();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::dirty(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::dirty(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (vp.IsGetting())
         {
                 if (m_pDocument->GetChangeMark())
                         vp << true;
                 else
                         vp << false;
         }
         else
         {
                 bool bChanged = false;
 
                 vp >> bChanged;
 
                 if (bChanged)
                         m_pDocument->SetChangeMark();
                 else
                         m_pDocument->ClearChangeMark();
         }
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::ADBE(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::ADBE(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (vp.IsGetting())
         {
                 vp.SetNull();
         }
         else
         {
         }
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::pageNum(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::pageNum(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (vp.IsGetting())
         {
                 if (CPDFSDK_PageView* pPageView = m_pDocument->GetCurrentView())
                 {
                         vp << pPageView->GetPageIndex();
                 }
         }
@@ skipping 11 matching lines @@
                 else if (iPageNum >= iPageCount)
                 {
                          pEnv->JS_docgotoPage(iPageCount-1);
                 }
                 else if (iPageNum < 0)
                 {
                          pEnv->JS_docgotoPage(0);
                 }
         }
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::ParserParams(JSObject* pObj,CJS_AnnotObj& annotobj)
+bool Document::ParserParams(JSObject* pObj,CJS_AnnotObj& annotobj)
 {
         // Not supported.
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::addAnnot(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::addAnnot(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Not supported.
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::addField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::addField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Not supported.
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::exportAsText(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::exportAsText(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Unsafe, not supported.
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::exportAsFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::exportAsFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Unsafe, not supported.
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::exportAsXFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::exportAsXFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Unsafe, not supported.
-        return TRUE;
+        return true;
 }
 
 //Maps a field object in PDF document to a JavaScript variable
 //comment:
 //note: the paremter cName, this is clue how to treat if the cName is not a valiable filed name in this document
 
-FX_BOOL Document::getField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         if (params.size() < 1) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-                return FALSE;
+                return false;
         }
 
         CFX_WideString wideName = params[0].ToCFXWideString();
 
         CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
         CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
         if (pPDFForm->CountFields(wideName) <= 0)
         {
                 vRet.SetNull();
-                return TRUE;
+                return true;
         }
 
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
         JSFXObject pFieldObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"Field"));
 
         v8::Isolate* isolate = GetIsolate(cc);
         CJS_Field* pJSField = (CJS_Field*)JS_GetPrivate(isolate,pFieldObj);
         Field* pField = (Field *)pJSField->GetEmbedObject();
         pField->AttachField(this, wideName);
 
         vRet = pJSField;
-        return TRUE;
+        return true;
 }
 
 //Gets the name of the nth field in the document
-FX_BOOL Document::getNthFieldName(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getNthFieldName(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         if (params.size() != 1) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-                return FALSE;
+                return false;
         }
 
         int nIndex = params[0].ToInt();
         if (nIndex < 0) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
-                return FALSE;
+                return false;
         }
 
         CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
         CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
         CPDF_FormField* pField = pPDFForm->GetField(nIndex);
         if (!pField)
-                return FALSE;
+                return false;
 
         vRet = pField->GetFullName().c_str();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::importAnFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::importAnFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Unsafe, not supported.
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::importAnXFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::importAnXFDF(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Unsafe, not supported.
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::importTextData(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::importTextData(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         // Unsafe, not supported.
-        return TRUE;
+        return true;
 }
 
 //exports the form data and mails the resulting fdf file as an attachment to all recipients.
 //comment: need reader supports
 //note:
-//int CPDFSDK_Document::mailForm(FX_BOOL bUI,String cto,string ccc,string cbcc,string cSubject,string cms);
+//int CPDFSDK_Document::mailForm(bool bUI,String cto,string ccc,string cbcc,string cSubject,string cms);
 
-FX_BOOL Document::mailForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::mailForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
-        if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE;
+        if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return false;
 
         int iLength = params.size();
 
-        FX_BOOL bUI = iLength > 0 ? params[0].ToBool() : TRUE;
+        bool bUI = iLength > 0 ? params[0].ToBool() : true;
         CFX_WideString cTo = iLength > 1 ? params[1].ToCFXWideString() : L"";
         CFX_WideString cCc = iLength > 2 ? params[2].ToCFXWideString() : L"";
         CFX_WideString cBcc = iLength > 3 ? params[3].ToCFXWideString() : L"";
         CFX_WideString cSubject = iLength > 4 ? params[4].ToCFXWideString() : L"";
         CFX_WideString cMsg = iLength > 5 ? params[5].ToCFXWideString() : L"";
 
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
         ASSERT(pInterForm != NULL);
 
         CFX_ByteTextBuf textBuf;
         if (!pInterForm->ExportFormToFDFTextBuf(textBuf))
-                return FALSE;
+                return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CPDFDoc_Environment* pEnv = pContext->GetReaderApp();
         ASSERT(pEnv != NULL);
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
         ASSERT(pRuntime != NULL);
 
         pRuntime->BeginBlock();
         pEnv->JS_docmailForm(textBuf.GetBuffer(), textBuf.GetLength(), bUI, cTo.c_str(), cSubject.c_str(), cCc.c_str(), cBcc.c_str(), cMsg.c_str());
         pRuntime->EndBlock();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::print(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::print(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
         ASSERT(pRuntime != NULL);
 
-        FX_BOOL bUI = TRUE;
+        bool bUI = true;
         int nStart = 0;
         int nEnd = 0;
-        FX_BOOL bSilent = FALSE;
-        FX_BOOL bShrinkToFit = FALSE;
-        FX_BOOL bPrintAsImage = FALSE;
-        FX_BOOL bReverse = FALSE;
-        FX_BOOL bAnnotations = FALSE;
+        bool bSilent = false;
+        bool bShrinkToFit = false;
+        bool bPrintAsImage = false;
+        bool bReverse = false;
+        bool bAnnotations = false;
 
         int nlength = params.size();
         if(nlength ==9)
         {
                 if (params[8].GetType() == VT_fxobject)
                 {
                         JSFXObject pObj = params[8].ToV8Object();
                         {
                                 if (JS_GetObjDefnID(pObj) == JS_GetObjDefnID(*pRuntime, L"PrintParamsObj"))
                                 {
@@ skipping 33 matching lines @@
                         bReverse = params[6].ToBool();
                 if(nlength >= 8)
                         bAnnotations = params[7].ToBool();
         }
 
         ASSERT(m_pDocument != NULL);
 
         if (CPDFDoc_Environment* pEnv = m_pDocument->GetEnv())
         {
                 pEnv->JS_docprint(bUI, nStart, nEnd, bSilent, bShrinkToFit, bPrintAsImage, bReverse, bAnnotations);
-                return TRUE;
+                return true;
         }
-        return FALSE;
+        return false;
 }
 
 //removes the specified field from the document.
 //comment:
 //note: if the filed name is not retional, adobe is dumb for it.
 
-FX_BOOL Document::removeField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::removeField(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (!(m_pDocument->GetPermissions(FPDFPERM_MODIFY) ||
-                m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM))) return FALSE;
+                m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM))) return false;
 
         CJS_Context* pContext = (CJS_Context*)cc;
         if (params.size() != 1) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-                return FALSE;
+                return false;
         }
 
         CFX_WideString sFieldName = params[0].ToCFXWideString();
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
         ASSERT(pInterForm != NULL);
 
         CFX_PtrArray widgets;
         pInterForm->GetWidgets(sFieldName, widgets);
 
         int nSize = widgets.GetSize();
@@ skipping 18 matching lines @@
                         ASSERT(pPage != NULL);
 
                         CPDFSDK_PageView* pPageView = m_pDocument->GetPageView(pPage);
                         pPageView->DeleteAnnot(pWidget);
 
                         pPageView->UpdateRects(aRefresh);
                 }
                 m_pDocument->SetChangeMark();
         }
 
-        return TRUE;
+        return true;
 }
 
 //reset filed values within a document.
 //comment:
 //note: if the fields names r not rational, aodbe is dumb for it.
 
-FX_BOOL Document::resetForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::resetForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (!(m_pDocument->GetPermissions(FPDFPERM_MODIFY) ||
                 m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM) ||
-                m_pDocument->GetPermissions(FPDFPERM_FILL_FORM))) return FALSE;
+                m_pDocument->GetPermissions(FPDFPERM_FILL_FORM))) return false;
 
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
         ASSERT(pInterForm != NULL);
 
         CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
         ASSERT(pPDFForm != NULL);
 
         v8::Isolate* isolate = GetIsolate(cc);
         CJS_Array aName(isolate);
 
@@ skipping 18 matching lines @@
                         CFX_WideString swVal = valElement.ToCFXWideString();
 
                         for (int j=0,jsz=pPDFForm->CountFields(swVal); j<jsz; j++)
                         {
                                 aFields.Add((void*)pPDFForm->GetField(j,swVal));
                         }
                 }
 
                 if (aFields.GetSize() > 0)
                 {
-                        pPDFForm->ResetForm(aFields, TRUE, TRUE);
+                        pPDFForm->ResetForm(aFields, true, true);
                         m_pDocument->SetChangeMark();
 
                 }
         }
         else
         {
-                pPDFForm->ResetForm(TRUE);
+                pPDFForm->ResetForm(true);
                 m_pDocument->SetChangeMark();
 
         }
 
-        return TRUE;
+        return true;
 }
 
 
-FX_BOOL Document::saveAs(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::saveAs(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, not supported.
-  return TRUE;
+  return true;
 }
 
 
-FX_BOOL Document::submitForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::submitForm(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
         CJS_Context* pContext = (CJS_Context*)cc;
         int nSize = params.size();
         if (nSize < 1) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-                return FALSE;
+                return false;
         }
 
         CFX_WideString strURL;
-        FX_BOOL bFDF = TRUE;
-        FX_BOOL bEmpty = FALSE;
+        bool bFDF = true;
+        bool bEmpty = false;
         v8::Isolate* isolate = GetIsolate(cc);
         CJS_Array aFields(isolate);
 
         CJS_Value v = params[0];
         if (v.GetType() == VT_string)
         {
                 strURL = params[0].ToCFXWideString();
                 if (nSize > 1)
                         bFDF = params[1].ToBool();
                 if (nSize > 2)
@@ skipping 13 matching lines @@
                 bEmpty = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToBool();
                 pValue = JS_GetObjectElement(isolate, pObj,L"aFields");
                 aFields.Attach(CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToV8Array());
         }
 
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
         ASSERT(pInterForm != NULL);
         CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
         ASSERT(pPDFInterForm != NULL);
 
-        FX_BOOL bAll = (aFields.GetLength() == 0);
+        bool bAll = (aFields.GetLength() == 0);
 
         if (bAll && bEmpty)
         {
                 CJS_Context* pContext = (CJS_Context*)cc;
                 ASSERT(pContext != NULL);
                 CJS_Runtime* pRuntime = pContext->GetJSRuntime();
                 ASSERT(pRuntime != NULL);
 
 
                 if (pPDFInterForm->CheckRequiredFields())
                 {
                         pRuntime->BeginBlock();
-                        pInterForm->SubmitForm(strURL, FALSE);
+                        pInterForm->SubmitForm(strURL, false);
                         pRuntime->EndBlock();
                 }
 
-                return TRUE;
+                return true;
         }
         else
         {
                 CFX_PtrArray fieldObjects;
 
                 for (int i=0,sz=aFields.GetLength(); i<sz; i++)
                 {
                         CJS_Value valName(isolate);
                         aFields.GetElement(i, valName);
                         CFX_WideString sName = valName.ToCFXWideString();
@@ skipping 10 matching lines @@
                                 fieldObjects.Add(pField);
                         }
                 }
 
                 CJS_Context* pContext = (CJS_Context*)cc;
                 ASSERT(pContext != NULL);
                 CJS_Runtime* pRuntime = pContext->GetJSRuntime();
                 ASSERT(pRuntime != NULL);
 
 
-                if (pPDFInterForm->CheckRequiredFields(&fieldObjects, TRUE))
+                if (pPDFInterForm->CheckRequiredFields(&fieldObjects, true))
                 {
                         pRuntime->BeginBlock();
-                        pInterForm->SubmitFields(strURL, fieldObjects, TRUE, !bFDF);
+                        pInterForm->SubmitFields(strURL, fieldObjects, true, !bFDF);
                         pRuntime->EndBlock();
                 }
 
-                return TRUE;
+                return true;
         }
 
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 
 void Document::AttachDoc(CPDFSDK_Document *pDoc)
 {
         m_pDocument = pDoc;
 }
 
 CPDFSDK_Document * Document::GetReaderDoc()
 {
         return m_pDocument;
 }
 
-FX_BOOL Document::ExtractFileName(CPDFSDK_Document *pDoc,CFX_ByteString &strFileName)
+bool Document::ExtractFileName(CPDFSDK_Document *pDoc,CFX_ByteString &strFileName)
 {
-        return FALSE;
+        return false;
 }
 
-FX_BOOL Document::ExtractFolderName(CPDFSDK_Document *pDoc,CFX_ByteString &strFolderName)
+bool Document::ExtractFolderName(CPDFSDK_Document *pDoc,CFX_ByteString &strFolderName)
 {
-        return FALSE;
+        return false;
 }
 
-FX_BOOL Document::bookmarkRoot(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::bookmarkRoot(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::mailDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::mailDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
-        FX_BOOL bUI = TRUE;
+        bool bUI = true;
         CFX_WideString cTo = L"";
         CFX_WideString cCc = L"";
         CFX_WideString cBcc = L"";
         CFX_WideString cSubject = L"";
         CFX_WideString cMsg = L"";
 
         if (params.size() >= 1)
                 bUI = params[0].ToBool();
         if (params.size() >= 2)
                 cTo = params[1].ToCFXWideString();
@@ skipping 35 matching lines @@
         CJS_Context* pContext = (CJS_Context*)cc;
         ASSERT(pContext != NULL);
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
         ASSERT(pRuntime != NULL);
 
         pRuntime->BeginBlock();
         CPDFDoc_Environment* pEnv = pRuntime->GetReaderApp();
         pEnv->JS_docmailForm(NULL, 0, bUI, cTo.c_str(), cSubject.c_str(), cCc.c_str(), cBcc.c_str(), cMsg.c_str());
         pRuntime->EndBlock();
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::author(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::author(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Author");
-                return TRUE;
+                return true;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 CFX_WideString csAuthor;
                 vp >> csAuthor;
                 pDictionary->SetAtString("Author", PDF_EncodeText(csAuthor));
                 m_pDocument->SetChangeMark();
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::info(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::info(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         CFX_WideString cwAuthor                 = pDictionary->GetUnicodeText("Author");
         CFX_WideString cwTitle                  = pDictionary->GetUnicodeText("Title");
         CFX_WideString cwSubject                = pDictionary->GetUnicodeText("Subject");
         CFX_WideString cwKeywords               = pDictionary->GetUnicodeText("Keywords");
         CFX_WideString cwCreator                = pDictionary->GetUnicodeText("Creator");
         CFX_WideString cwProducer               = pDictionary->GetUnicodeText("Producer");
         CFX_WideString cwCreationDate   = pDictionary->GetUnicodeText("CreationDate");
         CFX_WideString cwModDate                = pDictionary->GetUnicodeText("ModDate");
         CFX_WideString cwTrapped                = pDictionary->GetUnicodeText("Trapped");
@@ skipping 25 matching lines @@
                         CFX_WideString wsKey  = CFX_WideString::FromUTF8(bsKey, bsKey.GetLength());
                         if((pValueObj->GetType()==PDFOBJ_STRING) || (pValueObj->GetType()==PDFOBJ_NAME) )
                                 JS_PutObjectString(isolate, pObj, wsKey.c_str(), pValueObj->GetUnicodeText().c_str());
                         if(pValueObj->GetType()==PDFOBJ_NUMBER)
                                 JS_PutObjectNumber(isolate,pObj, wsKey.c_str(), (float)pValueObj->GetNumber());
                         if(pValueObj->GetType()==PDFOBJ_BOOLEAN)
                                 JS_PutObjectBoolean(isolate,pObj, wsKey.c_str(), (bool)pValueObj->GetInteger());
                 }
 
                 vp << pObj;
-                return TRUE;
+                return true;
         }
         else
         {
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::creationDate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::creationDate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("CreationDate");
-                return TRUE;
+                return true;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 CFX_WideString csCreationDate;
                 vp >> csCreationDate;
                 pDictionary->SetAtString("CreationDate", PDF_EncodeText(csCreationDate));
                 m_pDocument->SetChangeMark();
 
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::creator(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::creator(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Creator");
-                return TRUE;
+                return true;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 CFX_WideString csCreator;
                 vp >> csCreator;
                 pDictionary->SetAtString("Creator", PDF_EncodeText(csCreator));
                 m_pDocument->SetChangeMark();
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::delay(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::delay(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsGetting())
         {
                 vp << m_bDelay;
-                return TRUE;
+                return true;
         }
         else
         {
                 ASSERT(m_pDocument != NULL);
 
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 bool b;
                 vp >> b;
 
                 m_bDelay = b;
 
                 if (m_bDelay)
                 {
                         for (int i=0,sz=m_DelayData.GetSize(); i<sz; i++)
                                 delete m_DelayData.GetAt(i);
@@ skipping 16 matching lines @@
 
                         for (int i=0,sz=DelayDataToProcess.GetSize(); i < sz; i++)
                         {
                                 CJS_DelayData* pData = DelayDataToProcess.GetAt(i);
                                 Field::DoDelay(m_pDocument, pData);
                                 DelayDataToProcess.SetAt(i,NULL);
                                 delete pData;
                         }
                 }
 
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::keywords(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::keywords(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Keywords");
-                return TRUE;
+                return true;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 CFX_WideString csKeywords;
                 vp >> csKeywords;
                 pDictionary->SetAtString("Keywords", PDF_EncodeText(csKeywords));
                 m_pDocument->SetChangeMark();
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::modDate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::modDate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("ModDate");
-                return TRUE;
+                return true;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 CFX_WideString csmodDate;
                 vp >> csmodDate;
                 pDictionary->SetAtString("ModDate", PDF_EncodeText(csmodDate));
                 m_pDocument->SetChangeMark();
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::producer(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::producer(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Producer");
-                return TRUE;
+                return true;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 CFX_WideString csproducer;
                 vp >> csproducer;
                 pDictionary->SetAtString("Producer", PDF_EncodeText(csproducer));
                 m_pDocument->SetChangeMark();
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::subject(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::subject(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Subject");
-                return TRUE;
+                return true;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 CFX_WideString cssubject;
                 vp >> cssubject;
                 pDictionary->SetAtString("Subject", PDF_EncodeText(cssubject));
                 m_pDocument->SetChangeMark();
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::title(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::title(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (m_pDocument == NULL || m_pDocument->GetDocument() == NULL)
-                return FALSE;
+                return false;
 
         CPDF_Dictionary* pDictionary = m_pDocument->GetDocument()->GetInfo();
-        if (!pDictionary)return FALSE;
+        if (!pDictionary)return false;
 
         if (vp.IsGetting())
         {
                 vp << pDictionary->GetUnicodeText("Title");
-                return TRUE;
+                return true;
         }
         else
         {
-                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return FALSE;
+                if (!m_pDocument->GetPermissions(FPDFPERM_MODIFY)) return false;
 
                 CFX_WideString cstitle;
                 vp >> cstitle;
                 pDictionary->SetAtString("Title", PDF_EncodeText(cstitle));
                 m_pDocument->SetChangeMark();
-                return TRUE;
+                return true;
         }
 }
 
-FX_BOOL Document::numPages(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::numPages(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting()) {
                 CJS_Context* pContext = static_cast<CJS_Context*>(cc);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
-                return FALSE;
+                return false;
         }
         vp << m_pDocument->GetPageCount();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::external(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::external(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         //In Chrome case,should always return true.
         if (vp.IsGetting()) {
-                vp << TRUE;
+                vp << true;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::filesize(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::filesize(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting()) {
                 CJS_Context* pContext = static_cast<CJS_Context*>(cc);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
-                return FALSE;
+                return false;
         }
         vp << 0;
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::mouseX(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::mouseX(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::mouseY(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::mouseY(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::baseURL(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::baseURL(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsGetting())
         {
                 vp << m_cwBaseURL;
         }
         else
         {
                 vp >> m_cwBaseURL;
         }
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::calculate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::calculate(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
         ASSERT(pInterForm != NULL);
 
         if (vp.IsGetting())
         {
                 if (pInterForm->IsCalculateEnabled())
                         vp << true;
                 else
                         vp << false;
         }
         else
         {
                 bool bCalculate;
                 vp >> bCalculate;
 
                 pInterForm->EnableCalculate(bCalculate);
         }
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::documentFileName(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::documentFileName(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting()) {
                 CJS_Context* pContext = static_cast<CJS_Context*>(cc);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
-                return FALSE;
+                return false;
         }
         CFX_WideString wsFilePath = m_pDocument->GetPath();
         int32_t i = wsFilePath.GetLength() - 1;
         for ( ; i >= 0; i-- )
         {
                 if ( wsFilePath.GetAt( i ) == L'\\' || wsFilePath.GetAt( i ) == L'/' )
                         break;
         }
         if ( i >= 0 && i < wsFilePath.GetLength() - 1 )
         {
                 vp << ( wsFilePath.GetBuffer( wsFilePath.GetLength() ) + i + 1 );
         }else{
                 vp << L"";
         }
-        return TRUE;
+        return true;
 }
 
 CFX_WideString Document::ReversalStr(CFX_WideString cbFrom)
 {
         size_t iLength = cbFrom.GetLength();
         pdfium::base::CheckedNumeric<size_t> iSize = sizeof(wchar_t);
         iSize *= (iLength + 1);
         wchar_t* pResult = (wchar_t*)malloc(iSize.ValueOrDie());
         wchar_t* pFrom = (wchar_t*)cbFrom.GetBuffer(iLength);
 
@@ skipping 29 matching lines @@
         }
         pResult[iLength] = L'\0';
 
         cbFrom.ReleaseBuffer();
         CFX_WideString cbRet = CFX_WideString(pResult);
         free(pResult);
         pResult = NULL;
         return cbRet;
 }
 
-FX_BOOL Document::path(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::path(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting()) {
                 CJS_Context* pContext = static_cast<CJS_Context*>(cc);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
-                return FALSE;
+                return false;
         }
         vp << app::SysPathToPDFPath(m_pDocument->GetPath());
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::pageWindowRect(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::pageWindowRect(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::layout(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::layout(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::addLink(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::addLink(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::closeDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::closeDoc(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getPageBox(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getPageBox(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getAnnot(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getAnnot(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getAnnots(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getAnnots(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         vRet.SetNull();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getAnnot3D(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getAnnot3D(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         vRet.SetNull();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getAnnots3D(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getAnnots3D(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         vRet = VT_undefined;
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getOCGs(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getOCGs(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getLinks(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getLinks(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
 bool Document::IsEnclosedInRect(CFX_FloatRect rect, CFX_FloatRect LinkRect)
 {
         if (rect.left <= LinkRect.left
           && rect.top <= LinkRect.top
           && rect.right >= LinkRect.right
           && rect.bottom >= LinkRect.bottom)
                 return true;
         else
@@ skipping 47 matching lines @@
                 for (int i = 0; i < iIndex; i++)
                 {
                         pTemp = pTemp->NextIcon;
                 }
                 return pTemp;
         }
         else
                 return NULL;
 }
 
-FX_BOOL Document::addIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::addIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         if (params.size() != 2) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-                return FALSE;
+                return false;
         }
 
         CFX_WideString swIconName = params[0].ToCFXWideString();
         JSFXObject pJSIcon = params[1].ToV8Object();
 
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
         if (JS_GetObjDefnID(pJSIcon) != JS_GetObjDefnID(*pRuntime, L"Icon")) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
-                return FALSE;
+                return false;
         }
 
         CJS_EmbedObj* pEmbedObj = params[1].ToCJSObject()->GetEmbedObject();
         if (!pEmbedObj) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
-                return FALSE;
+                return false;
         }
 
         Icon* pIcon = (Icon*)pEmbedObj;
         if (!m_pIconTree)
                 m_pIconTree = new IconTree();
 
         IconElement* pNewIcon = new IconElement();
         pNewIcon->IconName = swIconName;
         pNewIcon->NextIcon = NULL;
         pNewIcon->IconStream = pIcon;
         m_pIconTree->InsertIconElement(pNewIcon);
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::icons(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::icons(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         if (vp.IsSetting()) {
                 CJS_Context* pContext = static_cast<CJS_Context*>(cc);
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
-                return FALSE;
+                return false;
         }
 
         if (!m_pIconTree)
         {
                 vp.SetNull();
-                return TRUE;
+                return true;
         }
 
         CJS_Array Icons(m_isolate);
         IconElement* pIconElement = NULL;
         int iIconTreeLength = m_pIconTree->GetLength();
 
         CJS_Context* pContext = (CJS_Context *)cc;
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
 
         for (int i = 0; i < iIconTreeLength; i++)
         {
                 pIconElement = (*m_pIconTree)[i];
 
                 JSFXObject  pObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"Icon"));
-                if (pObj.IsEmpty()) return FALSE;
+                if (pObj.IsEmpty()) return false;
 
                 CJS_Icon * pJS_Icon = (CJS_Icon *)JS_GetPrivate(pObj);
-                if (!pJS_Icon) return FALSE;
+                if (!pJS_Icon) return false;
 
                 Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
-                if (!pIcon)return FALSE;
+                if (!pIcon)return false;
 
                 pIcon->SetStream(pIconElement->IconStream->GetStream());
                 pIcon->SetIconName(pIconElement->IconName);
                 Icons.SetElement(i, CJS_Value(m_isolate,pJS_Icon));
         }
 
         vp << Icons;
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context *)cc;
         if (params.size() != 1) {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-                return FALSE;
+                return false;
         }
 
         if(!m_pIconTree)
-                return FALSE;
+                return false;
         CFX_WideString swIconName = params[0].ToCFXWideString();
         int iIconCounts = m_pIconTree->GetLength();
 
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
 
         for (int i = 0; i < iIconCounts; i++)
         {
                 if ((*m_pIconTree)[i]->IconName == swIconName)
                 {
                         Icon* pRetIcon = (*m_pIconTree)[i]->IconStream;
 
                         JSFXObject  pObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"Icon"));
-                        if (pObj.IsEmpty()) return FALSE;
+                        if (pObj.IsEmpty()) return false;
 
                         CJS_Icon * pJS_Icon = (CJS_Icon *)JS_GetPrivate(pObj);
-                        if (!pJS_Icon) return FALSE;
+                        if (!pJS_Icon) return false;
 
                         Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
-                        if (!pIcon)return FALSE;
+                        if (!pIcon)return false;
 
                         pIcon->SetIconName(swIconName);
                         pIcon->SetStream(pRetIcon->GetStream());
                         vRet = pJS_Icon;
-                        return TRUE;
+                        return true;
                 }
         }
 
-        return FALSE;
+        return false;
 }
 
-FX_BOOL Document::removeIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::removeIcon(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, no supported.
-  return TRUE;
+  return true;
 }
 
-FX_BOOL Document::createDataObject(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::createDataObject(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, not implemented.
-  return TRUE;
+  return true;
 }
 
-FX_BOOL Document::media(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::media(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::calculateNow(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::calculateNow(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (!(m_pDocument->GetPermissions(FPDFPERM_MODIFY) ||
                 m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM) ||
-                m_pDocument->GetPermissions(FPDFPERM_FILL_FORM))) return FALSE;
+                m_pDocument->GetPermissions(FPDFPERM_FILL_FORM))) return false;
 
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)m_pDocument->GetInterForm();
         ASSERT(pInterForm != NULL);
         pInterForm->OnCalculate();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::Collab(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::Collab(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getPageNthWord(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getPageNthWord(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
-        if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE;
+        if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return false;
 
         int nPageNo = params.GetSize() > 0 ? params[0].ToInt() : 0;
         int nWordNo = params.GetSize() > 1 ? params[1].ToInt() : 0;
         bool bStrip = params.GetSize() > 2 ? params[2].ToBool() : true;
 
         CPDF_Document* pDocument = m_pDocument->GetDocument();
-        if (!pDocument) return FALSE;
+        if (!pDocument) return false;
 
         CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount())
         {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
-                return FALSE;
+                return false;
         }
 
         CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
-        if (!pPageDict) return FALSE;
+        if (!pPageDict) return false;
 
         CPDF_Page page;
         page.Load(pDocument, pPageDict);
         page.StartParse();
         page.ParseContent();
 
         FX_POSITION pos = page.GetFirstObjectPosition();
 
         int nWords = 0;
 
@@ skipping 18 matching lines @@
                 }
         }
 
         if (bStrip)
         {
                 swRet.TrimLeft();
                 swRet.TrimRight();
         }
 
         vRet = swRet.c_str();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getPageNthWordQuads(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getPageNthWordQuads(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
-        if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE;
+        if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return false;
 
-        return FALSE;
+        return false;
 }
 
-FX_BOOL Document::getPageNumWords(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getPageNumWords(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
-        if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return FALSE;
+        if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS)) return false;
 
         int nPageNo = params.GetSize() > 0 ? params[0].ToInt() : 0;
 
         CPDF_Document* pDocument = m_pDocument->GetDocument();
         ASSERT(pDocument != NULL);
 
         CJS_Context* pContext = static_cast<CJS_Context*>(cc);
         if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount())
         {
                 sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
-                return FALSE;
+                return false;
         }
 
         CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
-        if (!pPageDict) return FALSE;
+        if (!pPageDict) return false;
 
         CPDF_Page page;
         page.Load(pDocument, pPageDict);
         page.StartParse();
         page.ParseContent();
 
         FX_POSITION pos = page.GetFirstObjectPosition();
 
         int nWords = 0;
 
         while (pos)
         {
                 if (CPDF_PageObject* pPageObj = page.GetNextObject(pos))
                 {
                         if (pPageObj->m_Type == PDFPAGE_TEXT)
                         {
                                 CPDF_TextObject* pTextObj = (CPDF_TextObject*)pPageObj;
                                 nWords += CountWords(pTextObj);
                         }
                 }
         }
 
         vRet = nWords;
 
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::getPrintParams(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getPrintParams(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         CJS_Context* pContext = (CJS_Context*)cc;
         CJS_Runtime* pRuntime = pContext->GetJSRuntime();
         JSFXObject pRetObj = JS_NewFxDynamicObj(*pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"PrintParamsObj"));
 
         // Not implemented yet.
 
         vRet = pRetObj;
-        return TRUE;
+        return true;
 }
 
 #define ISLATINWORD(u)  (u != 0x20 && u <= 0x28FF)
 
 int     Document::CountWords(CPDF_TextObject* pTextObj)
 {
         if (!pTextObj) return 0;
 
         int nWords = 0;
 
         CPDF_Font* pFont = pTextObj->GetFont();
         if (!pFont) return 0;
 
-        FX_BOOL bIsLatin = FALSE;
+        bool bIsLatin = false;
 
         for (int i=0, sz=pTextObj->CountChars(); i<sz; i++)
         {
                 FX_DWORD charcode = -1;
                 FX_FLOAT kerning;
 
                 pTextObj->GetCharInfo(i, charcode, kerning);
                 CFX_WideString swUnicode = pFont->UnicodeFromCharCode(charcode);
 
                 FX_WORD unicode = 0;
@@ skipping 14 matching lines @@
 CFX_WideString Document::GetObjWordStr(CPDF_TextObject* pTextObj, int nWordIndex)
 {
         ASSERT(pTextObj != NULL);
 
         CFX_WideString swRet;
 
         CPDF_Font* pFont = pTextObj->GetFont();
         if (!pFont) return L"";
 
         int nWords = 0;
-        FX_BOOL bIsLatin = FALSE;
+        bool bIsLatin = false;
 
         for (int i=0, sz=pTextObj->CountChars(); i<sz; i++)
         {
                 FX_DWORD charcode = -1;
                 FX_FLOAT kerning;
 
                 pTextObj->GetCharInfo(i, charcode, kerning);
                 CFX_WideString swUnicode = pFont->UnicodeFromCharCode(charcode);
 
                 FX_WORD unicode = 0;
@@ skipping 10 matching lines @@
                                 nWords++;
                 }
 
                 if (nWords-1 == nWordIndex)
                         swRet += unicode;
         }
 
         return swRet;
 }
 
-FX_BOOL Document::zoom(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::zoom(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
 
-        return TRUE;
+        return true;
 }
 
 /**
 (none,  NoVary)
 (fitP,  FitPage)
 (fitW,  FitWidth)
 (fitH,  FitHeight)
 (fitV,  FitVisibleWidth)
 (pref,  Preferred)
 (refW,  ReflowWidth)
 */
 
-FX_BOOL Document::zoomType(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
+bool Document::zoomType(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
-        return TRUE;
+        return true;
 }
 
-FX_BOOL Document::deletePages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::deletePages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, no supported.
-  return TRUE;
+  return true;
 }
 
-FX_BOOL Document::extractPages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::extractPages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, not supported.
-  return TRUE;
+  return true;
 }
 
-FX_BOOL Document::insertPages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::insertPages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, not supported.
-  return TRUE;
+  return true;
 }
 
-FX_BOOL Document::replacePages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::replacePages(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, not supported.
-  return TRUE;
+  return true;
 }
 
-FX_BOOL Document::getURL(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool Document::getURL(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
   // Unsafe, not supported.
-  return TRUE;
+  return true;
 }
 
 void Document::AddDelayData(CJS_DelayData* pData)
 {
         m_DelayData.Add(pData);
 }
 
 void Document::DoFieldDelay(const CFX_WideString& sFieldName, int nControlIndex)
 {
         CFX_DWordArray DelArray;
@@ skipping 39 matching lines @@
         {
                 m_DelayData.RemoveAt(DelArray[j]);
         }
 }
 
 CJS_Document* Document::GetCJSDoc() const
 {
         return static_cast<CJS_Document*>(m_pJSObject);
 }