From f1e7c461dfabbff6b65a072f24f6711b34159361 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Jul 2015 13:36:00 -0700 Subject: Revert "FX_BOOL considered harmful, part 2." This reverts commit 320b2313d19869333ed453af546e61a9fc2b81c9. Reason for revert: build failure. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1255693002 . --- fpdfsdk/src/fpdf_ext.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'fpdfsdk/src/fpdf_ext.cpp') diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp index 741347474c..0d8db417ac 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -14,7 +14,7 @@ class CFSDK_UnsupportInfo_Adapter { public: CFSDK_UnsupportInfo_Adapter(UNSUPPORT_INFO* unsp_info){ m_unsp_info = unsp_info;} -// bool NeedToPauseNow(); +// FX_BOOL NeedToPauseNow(); void ReportError(int nErrorType); private: @@ -35,25 +35,25 @@ void FreeUnsupportInfo(void* pData) delete pAdapter; } -bool FPDF_UnSupportError(int nError) +FX_BOOL FPDF_UnSupportError(int nError) { CFSDK_UnsupportInfo_Adapter * pAdapter = (CFSDK_UnsupportInfo_Adapter *)CPDF_ModuleMgr::Get()->GetPrivateData((void *)FPDFSDK_UNSUPPORT_CALL); if(!pAdapter) - return false; + return FALSE; pAdapter->ReportError(nError); - return true; + return TRUE; } DLLEXPORT FPDF_BOOL STDCALL FSDK_SetUnSpObjProcessHandler(UNSUPPORT_INFO* unsp_info) { if (!unsp_info || unsp_info->version!=1) - return false; + return FALSE; CFSDK_UnsupportInfo_Adapter * pAdapter = new CFSDK_UnsupportInfo_Adapter(unsp_info); CPDF_ModuleMgr::Get()->SetPrivateData((void *)FPDFSDK_UNSUPPORT_CALL,pAdapter, &FreeUnsupportInfo); - return true; + return TRUE; } void CheckUnSupportAnnot(CPDF_Document * pDoc, CPDF_Annot* pPDFAnnot) @@ -104,7 +104,7 @@ void CheckUnSupportAnnot(CPDF_Document * pDoc, CPDF_Annot* pPDFAnnot) } -bool CheckSharedForm(CXML_Element * pElement, CFX_ByteString cbName) +FX_BOOL CheckSharedForm(CXML_Element * pElement, CFX_ByteString cbName) { int count = pElement->CountAttrs(); int i=0; @@ -143,10 +143,10 @@ bool CheckSharedForm(CXML_Element * pElement, CFX_ByteString cbName) { CXML_Element * pChild = pElement->GetElement(i); if(CheckSharedForm(pChild, cbName)) - return true; + return TRUE; } } - return false; + return FALSE; } void CheckUnSupportError(CPDF_Document * pDoc, FX_DWORD err_code) @@ -206,7 +206,7 @@ void CheckUnSupportError(CPDF_Document * pDoc, FX_DWORD err_code) CheckSharedForm(pElement, "workflowType"); // XFA Forms - CPDF_InterForm * pInterForm = new CPDF_InterForm(pDoc,false); + CPDF_InterForm * pInterForm = new CPDF_InterForm(pDoc,FALSE); if (pInterForm->HasXFAForm()) { FPDF_UnSupportError(FPDF_UNSP_DOC_XFAFORM); -- cgit v1.2.3