From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 13:24:12 -0700 Subject: Merge to XFA: Use stdint.h types throughout PDFium. Near-automatic merge, plus re-running scripts to update additional usage. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1172793002 --- fpdfsdk/include/fpdfxfa/fpdfxfa_app.h | 8 ++++---- fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h | 18 +++++++++--------- fpdfsdk/include/fpdfxfa/fpdfxfa_util.h | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'fpdfsdk/include/fpdfxfa') diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h index 37a7ec17a5..1a8a6b41b0 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h @@ -49,19 +49,19 @@ public: } void Beep(FX_DWORD dwType) override; - FX_INT32 MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle, FX_DWORD dwIconType, FX_DWORD dwButtonType) override; + int32_t MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle, FX_DWORD dwIconType, FX_DWORD dwButtonType) override; void Response(CFX_WideString &wsAnswer, FX_WSTR wsQuestion, FX_WSTR wsTitle, FX_WSTR wsDefaultAnswer, FX_BOOL bMark) override; - FX_INT32 GetDocumentCountInBatch() override; - FX_INT32 GetCurDocumentInBatch() override; + int32_t GetDocumentCountInBatch() override; + int32_t GetCurDocumentInBatch() override; IFX_FileRead* DownloadURL(FX_WSTR wsURL) override; FX_BOOL PostRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsContentType, FX_WSTR wsEncode, FX_WSTR wsHeader, CFX_WideString &wsResponse) override; FX_BOOL PutRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsEncode) override; - void LoadString(FX_INT32 iStringID, CFX_WideString &wsString) override; + void LoadString(int32_t iStringID, CFX_WideString &wsString) override; FX_BOOL ShowFileDialog(FX_WSTR wsTitle, FX_WSTR wsFilter, CFX_WideStringArray &wsPathArr, FX_BOOL bOpen) override; IFWL_AdapterTimerMgr* GetTimerMgr() override; diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h index 9158b8236a..d8cda3953f 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h @@ -62,9 +62,9 @@ public: virtual FX_BOOL RenderCustomWidget(IXFA_Widget* hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix, const CFX_RectF& rtUI){return FALSE;} //host method - virtual FX_INT32 CountPages(IXFA_Doc* hDoc); - virtual FX_INT32 GetCurrentPage(IXFA_Doc* hDoc); - virtual void SetCurrentPage(IXFA_Doc* hDoc, FX_INT32 iCurPage); + virtual int32_t CountPages(IXFA_Doc* hDoc); + virtual int32_t GetCurrentPage(IXFA_Doc* hDoc); + virtual void SetCurrentPage(IXFA_Doc* hDoc, int32_t iCurPage); virtual FX_BOOL IsCalculationsEnabled(IXFA_Doc* hDoc); virtual void SetCalculationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled); virtual void GetTitle(IXFA_Doc* hDoc, CFX_WideString &wsTitle); @@ -75,17 +75,17 @@ public: virtual FX_BOOL IsValidationsEnabled(IXFA_Doc* hDoc); virtual void SetValidationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled); virtual void SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget); - virtual void Print(IXFA_Doc* hDoc, FX_INT32 nStartPage, FX_INT32 nEndPage, FX_DWORD dwOptions); + virtual void Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, FX_DWORD dwOptions); //LayoutPseudo method - virtual FX_INT32 AbsPageCountInBatch(IXFA_Doc* hDoc){return 0;} - virtual FX_INT32 AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget){return 0;} - virtual FX_INT32 SheetCountInBatch(IXFA_Doc* hDoc){return 0;} - virtual FX_INT32 SheetInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget){return 0;} + virtual int32_t AbsPageCountInBatch(IXFA_Doc* hDoc){return 0;} + virtual int32_t AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget){return 0;} + virtual int32_t SheetCountInBatch(IXFA_Doc* hDoc){return 0;} + virtual int32_t SheetInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget){return 0;} //SignaturePseudoModel method //TODO: - virtual FX_INT32 Verify(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bUsed = TRUE/*, SecurityHandler* pHandler, SignatureInfo &info*/) {return 0;} + virtual int32_t Verify(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bUsed = TRUE/*, SecurityHandler* pHandler, SignatureInfo &info*/) {return 0;} virtual FX_BOOL Sign(IXFA_Doc* hDoc, CXFA_NodeList* pNodeList, FX_WSTR wsExpression, FX_WSTR wsXMLIdent, FX_WSTR wsValue = FX_WSTRC(L"open"), FX_BOOL bUsed = TRUE/*, SecurityHandler* pHandler = NULL, SignatureInfo &info*/) {return 0;} virtual CXFA_NodeList* Enumerate(IXFA_Doc* hDoc) {return 0;} virtual FX_BOOL Clear(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bCleared = TRUE) {return 0;} diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h index 6c3d15e4f1..9676b1399f 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h @@ -23,7 +23,7 @@ public: virtual FWL_ERR Stop(FWL_HTIMER hTimer); protected: - static void TimerProc(FX_INT32 idEvent); + static void TimerProc(int32_t idEvent); static CFX_PtrArray ms_timerArray; CPDFDoc_Environment* m_pEnv; @@ -37,7 +37,7 @@ public: { } - FX_UINT32 uIDEvent; + uint32_t uIDEvent; IFWL_Timer *pTimer; }; -- cgit v1.2.3