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

4 files changed, 220 insertions, 220 deletions

diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index da39113062..b732f98d9c 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -217,7 +217,7 @@ public:
      * @param[in] dwButtonType  Button type, refer to XFA_MESSAGEBUTTON.

      * @return A valid integer representing the value of the button pressed by the user, refer to XFA_ID.

      */

-    virtual FX_INT32 MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle = FX_WSTRC(L""),

+    virtual int32_t MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle = FX_WSTRC(L""),

                             FX_DWORD dwIconType = 0, FX_DWORD dwButtonType = 0) = 0;

 

     /**

@@ -227,8 +227,8 @@ public:
     virtual void Response(CFX_WideString &wsAnswer, FX_WSTR wsQuestion, FX_WSTR wsTitle = FX_WSTRC(L""),

                           FX_WSTR wsDefaultAnswer = FX_WSTRC(L""), FX_BOOL bMark = TRUE) = 0;

 

-    virtual FX_INT32 GetDocumentCountInBatch() = 0;

-    virtual FX_INT32 GetCurDocumentInBatch() = 0;

+    virtual int32_t GetDocumentCountInBatch() = 0;

+    virtual int32_t GetCurDocumentInBatch() = 0;

 

     /**

      * Download something from somewhere.

@@ -259,7 +259,7 @@ public:
      */

     virtual FX_BOOL     PutRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsEncode) = 0;

 

-    virtual void LoadString(FX_INT32 iStringID, CFX_WideString &wsString) = 0;

+    virtual void LoadString(int32_t iStringID, CFX_WideString &wsString) = 0;

     virtual FX_BOOL ShowFileDialog(FX_WSTR wsTitle, FX_WSTR wsFilter, CFX_WideStringArray &wsPathArr, FX_BOOL bOpen = TRUE) = 0;

     virtual IFWL_AdapterTimerMgr* GetTimerMgr() = 0;

 };

@@ -342,9 +342,9 @@ public:
     {

         return FALSE;

     }

-    virtual	FX_INT32	CountPages(IXFA_Doc* hDoc) = 0;

-    virtual	FX_INT32	GetCurrentPage(IXFA_Doc* hDoc) = 0;

-    virtual void		SetCurrentPage(IXFA_Doc* hDoc, FX_INT32 iCurPage) = 0;

+    virtual	int32_t	CountPages(IXFA_Doc* hDoc) = 0;

+    virtual	int32_t	GetCurrentPage(IXFA_Doc* hDoc) = 0;

+    virtual void		SetCurrentPage(IXFA_Doc* hDoc, int32_t iCurPage) = 0;

     virtual FX_BOOL		IsCalculationsEnabled(IXFA_Doc* hDoc) = 0;

     virtual void		SetCalculationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;

     virtual void		GetTitle(IXFA_Doc* hDoc, CFX_WideString &wsTitle) = 0;

@@ -355,12 +355,12 @@ public:
     virtual FX_BOOL		IsValidationsEnabled(IXFA_Doc* hDoc) = 0;

     virtual void		SetValidationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;

     virtual void		SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;

-    virtual void		Print(IXFA_Doc* hDoc, FX_INT32 nStartPage, FX_INT32 nEndPage, FX_DWORD dwOptions) = 0;

-    virtual FX_INT32			AbsPageCountInBatch(IXFA_Doc* hDoc) = 0;

-    virtual FX_INT32			AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;

-    virtual FX_INT32			SheetCountInBatch(IXFA_Doc* hDoc) = 0;

-    virtual FX_INT32			SheetInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;

-    virtual FX_INT32			Verify(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bUsed = TRUE)

+    virtual void		Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, FX_DWORD dwOptions) = 0;

+    virtual int32_t			AbsPageCountInBatch(IXFA_Doc* hDoc) = 0;

+    virtual int32_t			AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;

+    virtual int32_t			SheetCountInBatch(IXFA_Doc* hDoc) = 0;

+    virtual int32_t			SheetInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;

+    virtual int32_t			Verify(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bUsed = TRUE)

     {

         return 0;

     }

@@ -409,14 +409,14 @@ public:
     virtual IXFA_DocProvider*	GetDocProvider(IXFA_Doc* hDoc) = 0;

 

     virtual FX_DWORD			GetDocType(IXFA_Doc* hDoc) = 0;

-    virtual	FX_INT32			StartLoad(IXFA_Doc* hDoc) = 0;

-    virtual FX_INT32			DoLoad(IXFA_Doc* hDoc, IFX_Pause *pPause = NULL) = 0;

+    virtual	int32_t			StartLoad(IXFA_Doc* hDoc) = 0;

+    virtual int32_t			DoLoad(IXFA_Doc* hDoc, IFX_Pause *pPause = NULL) = 0;

     virtual void				StopLoad(IXFA_Doc* hDoc) = 0;

 

     virtual IXFA_DocView*		CreateDocView(IXFA_Doc* hDoc, FX_DWORD dwView = 0) = 0;

 

-    virtual FX_INT32			CountPackages(IXFA_Doc* hDoc) = 0;

-    virtual	void				GetPackageName(IXFA_Doc* hDoc, FX_INT32 iPackage, CFX_WideStringC &wsPackage) = 0;

+    virtual int32_t			CountPackages(IXFA_Doc* hDoc) = 0;

+    virtual	void				GetPackageName(IXFA_Doc* hDoc, int32_t iPackage, CFX_WideStringC &wsPackage) = 0;

 

     virtual FX_BOOL				SavePackage(IXFA_Doc* hDoc, FX_WSTR wsPackage, IFX_FileWrite* pFile, IXFA_ChecksumContext *pCSContext = NULL) = 0;

     virtual FX_BOOL				CloseDoc(IXFA_Doc* hDoc) = 0;

@@ -498,12 +498,12 @@ public:
     XFA_EVENTTYPE	m_eType;

     CFX_WideString	m_wsResult;

     FX_BOOL			m_bCancelAction;

-    FX_INT32		m_iCommitKey;

+    int32_t		m_iCommitKey;

     FX_BOOL			m_bKeyDown;

     FX_BOOL			m_bModifier;

     FX_BOOL			m_bReenter;

-    FX_INT32		m_iSelEnd;

-    FX_INT32		m_iSelStart;

+    int32_t		m_iSelEnd;

+    int32_t		m_iSelStart;

     FX_BOOL			m_bShift;

     CFX_WideString	m_wsChange;

     CFX_WideString	m_wsFullText;

@@ -514,7 +514,7 @@ public:
     CFX_WideString	m_wsSoapFaultCode;

     CFX_WideString	m_wsSoapFaultString;

     FX_BOOL			m_bIsFormReady;

-    FX_INT32		m_iValidateActivities;

+    int32_t		m_iValidateActivities;

 };

 #define XFA_EVENTERROR_Sucess		1

 #define XFA_EVENTERROR_Error		-1

@@ -529,18 +529,18 @@ public:
     virtual ~IXFA_DocView() { }

 

     virtual IXFA_Doc*			GetDoc() = 0;

-    virtual	FX_INT32			StartLayout(FX_INT32 iStartPage = 0) = 0;

-    virtual FX_INT32			DoLayout(IFX_Pause *pPause = NULL) = 0;

+    virtual	int32_t			StartLayout(int32_t iStartPage = 0) = 0;

+    virtual int32_t			DoLayout(IFX_Pause *pPause = NULL) = 0;

     virtual void				StopLayout() = 0;

 

-    virtual FX_INT32			GetLayoutStatus() = 0;

+    virtual int32_t			GetLayoutStatus() = 0;

     virtual	void				UpdateDocView() = 0;

-    virtual FX_INT32			CountPageViews() = 0;

-    virtual IXFA_PageView*		GetPageView(FX_INT32 nIndex) = 0;

+    virtual int32_t			CountPageViews() = 0;

+    virtual IXFA_PageView*		GetPageView(int32_t nIndex) = 0;

     virtual IXFA_Widget*			GetWidgetByName(FX_WSTR wsName) = 0;

     virtual CXFA_WidgetAcc*		GetWidgetAccByName(FX_WSTR wsName) = 0;

     virtual void				ResetWidgetData(CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;

-    virtual FX_INT32			ProcessWidgetEvent(CXFA_EventParam* pParam, CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;

+    virtual int32_t			ProcessWidgetEvent(CXFA_EventParam* pParam, CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;

     virtual IXFA_WidgetHandler*	GetWidgetHandler() = 0;

     virtual IXFA_WidgetIterator*	CreateWidgetIterator() = 0;

     virtual IXFA_WidgetAccIterator* CreateWidgetAccIterator(XFA_WIDGETORDER eOrder = XFA_WIDGETORDER_PreOrder) = 0;

@@ -561,12 +561,12 @@ public:
     virtual ~IXFA_PageView() { }

 

     virtual IXFA_DocView*	GetDocView() = 0;

-    virtual FX_INT32		GetPageViewIndex() = 0;

+    virtual int32_t		GetPageViewIndex() = 0;

     virtual void			GetPageViewRect(CFX_RectF &rtPage) = 0;

 

-    virtual void			GetDisplayMatrix(CFX_Matrix &mt, const CFX_Rect &rtDisp, FX_INT32 iRotate) = 0;

+    virtual void			GetDisplayMatrix(CFX_Matrix &mt, const CFX_Rect &rtDisp, int32_t iRotate) = 0;

 

-    virtual FX_INT32		LoadPageView(IFX_Pause *pPause = NULL) = 0;

+    virtual int32_t		LoadPageView(IFX_Pause *pPause = NULL) = 0;

     virtual void			UnloadPageView() = 0;

     virtual IXFA_Widget*		GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0;

     virtual IXFA_WidgetIterator* CreateWidgetIterator(FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0;

@@ -590,8 +590,8 @@ class IXFA_RenderContext
 {

 public:

     virtual void		Release() = 0;

-    virtual FX_INT32	StartRender(IXFA_PageView* pPageView, CFX_Graphics* pGS, const CFX_Matrix& pMatrix, const CXFA_RenderOptions& options) = 0;

-    virtual FX_INT32	DoRender(IFX_Pause* pPause = NULL) = 0;

+    virtual int32_t	StartRender(IXFA_PageView* pPageView, CFX_Graphics* pGS, const CFX_Matrix& pMatrix, const CXFA_RenderOptions& options) = 0;

+    virtual int32_t	DoRender(IFX_Pause* pPause = NULL) = 0;

     virtual	void		StopRender() = 0;

 protected:

     ~IXFA_RenderContext() { }

@@ -638,7 +638,7 @@ public:
     virtual FX_BOOL			GetBBox(IXFA_Widget* hWidget, CFX_RectF &rtBox, FX_DWORD dwStatus, FX_BOOL bDrawFocus = FALSE) = 0;

     virtual CXFA_WidgetAcc*	GetDataAcc(IXFA_Widget* hWidget) = 0;

 

-    virtual void			GetName(IXFA_Widget* hWidget, CFX_WideString &wsName, FX_INT32 iNameType = 0) = 0;

+    virtual void			GetName(IXFA_Widget* hWidget, CFX_WideString &wsName, int32_t iNameType = 0) = 0;

     virtual	FX_BOOL			GetToolTip(IXFA_Widget* hWidget, CFX_WideString &wsToolTip) = 0;

     virtual	void			SetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) = 0;

     virtual	FX_LPVOID		GetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id) = 0;

@@ -648,7 +648,7 @@ public:
     virtual FX_BOOL			OnLButtonUp(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;

     virtual FX_BOOL			OnLButtonDblClk(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;

     virtual FX_BOOL			OnMouseMove(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;

-    virtual FX_BOOL			OnMouseWheel(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_SHORT zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0;

+    virtual FX_BOOL			OnMouseWheel(IXFA_Widget* hWidget, FX_DWORD dwFlags, int16_t zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0;

     virtual FX_BOOL			OnRButtonDown(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;

     virtual FX_BOOL			OnRButtonUp(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;

     virtual FX_BOOL			OnRButtonDblClk(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;

@@ -661,7 +661,7 @@ public:
 

     virtual void			RenderWidget(IXFA_Widget* hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, FX_BOOL bHighlight = FALSE) = 0;

     virtual FX_BOOL			HasEvent(CXFA_WidgetAcc* pWidgetAcc, XFA_EVENTTYPE eEventType) = 0;

-    virtual FX_INT32		ProcessEvent(CXFA_WidgetAcc* pWidgetAcc, CXFA_EventParam* pParam) = 0;

+    virtual int32_t		ProcessEvent(CXFA_WidgetAcc* pWidgetAcc, CXFA_EventParam* pParam) = 0;

 };

 class IXFA_WidgetIterator

 {

diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h
index 6e45060b19..dcf1ac2e95 100644
--- a/xfa/include/fxfa/fxfa_basic.h
+++ b/xfa/include/fxfa/fxfa_basic.h
@@ -76,7 +76,7 @@ enum XFA_XDPPACKET_FLAGS {
     XFA_XDPPACKET_FLAGS_SUPPORTMANY		=	16,

 };

 typedef struct _XFA_PACKETINFO {

-    FX_UINT32					uHash;

+    uint32_t					uHash;

     FX_LPCWSTR					pName;

     XFA_XDPPACKET				eName;

     FX_LPCWSTR					pURI;

@@ -919,14 +919,14 @@ enum XFA_ELEMENT {
 };

 #define XFA_ELEMENT_UNKNOWN ((XFA_ELEMENT)-1)

 typedef struct _XFA_ELEMENTINFO {

-    FX_UINT32					uHash;

+    uint32_t					uHash;

     FX_LPCWSTR					pName;

     XFA_ELEMENT					eName;

     FX_DWORD					dwPackets;

     FX_DWORD					eObjectType;

 } XFA_ELEMENTINFO, * XFA_LPELEMENTINFO;

 typedef XFA_ELEMENTINFO const * XFA_LPCELEMENTINFO;

-FX_INT32 XFA_GetElementCount();

+int32_t XFA_GetElementCount();

 XFA_LPCELEMENTINFO XFA_GetElementByName(FX_WSTR wsName);

 XFA_LPCELEMENTINFO XFA_GetElementByID(XFA_ELEMENT eName);

 enum XFA_ATTRIBUTETYPE {

@@ -938,7 +938,7 @@ enum XFA_ATTRIBUTETYPE {
     XFA_ATTRIBUTETYPE_Measure,

 };

 typedef struct _XFA_ATTRIBUTEINFO {

-    FX_UINT32					uHash;

+    uint32_t					uHash;

     FX_LPCWSTR					pName;

     XFA_ATTRIBUTE				eName;

     XFA_ATTRIBUTETYPE			eType;

@@ -946,14 +946,14 @@ typedef struct _XFA_ATTRIBUTEINFO {
     FX_LPVOID					pDefValue;

 } XFA_ATTRIBUTEINFO, * XFA_LPATTRIBUTEINFO;

 typedef XFA_ATTRIBUTEINFO const * XFA_LPCATTRIBUTEINFO;

-FX_INT32 XFA_GetAttributeCount();

+int32_t XFA_GetAttributeCount();

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(FX_WSTR wsName);

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName);

 FX_BOOL XFA_GetAttributeDefaultValue(FX_LPVOID &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);

 XFA_ATTRIBUTEENUM	XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 CFX_WideStringC		XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 FX_BOOL				XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

-FX_INT32			XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

+int32_t			XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 CXFA_Measurement	XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 typedef struct _XFA_ELEMENTHIERARCHY {

     FX_WORD						wStart;

@@ -966,25 +966,25 @@ typedef struct _XFA_SCRIPTHIERARCHY {
     FX_WORD						wMethodCount;

     FX_WORD						wAttributeStart;

     FX_WORD						wAttributeCount;

-    FX_SHORT					wParentIndex;

+    int16_t					wParentIndex;

 } XFA_SCRIPTHIERARCHY, * XFA_LPSCRIPTHIERARCHY;

 typedef XFA_SCRIPTHIERARCHY const * XFA_LPCSCRIPTHIERARCHY;

-FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, FX_INT32 &iCount);

-FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, FX_INT32 &iCount);

+FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount);

+FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount);

 XFA_LPCELEMENTINFO XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, FX_DWORD dwPacket);

 XFA_LPCATTRIBUTEINFO XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);

 #define XFA_PROPERTYFLAG_OneOf			0x01

 #define XFA_PROPERTYFLAG_DefaultOneOf	0x02

 typedef struct _XFA_PROPERTY {

     FX_WORD						eName;

-    FX_BYTE						uOccur;

-    FX_BYTE						uFlags;

+    uint8_t						uOccur;

+    uint8_t						uFlags;

 } XFA_PROPERTY, * XFA_LPPROPERTY;

 typedef XFA_PROPERTY const * XFA_LPCPROPERTY;

-XFA_LPCPROPERTY XFA_GetElementProperties(XFA_ELEMENT eElement, FX_INT32 &iCount);

+XFA_LPCPROPERTY XFA_GetElementProperties(XFA_ELEMENT eElement, int32_t &iCount);

 XFA_LPCPROPERTY XFA_GetPropertyOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eProperty, FX_DWORD dwPacket);

 typedef struct _XFA_ATTRIBUTEENUMINFO {

-    FX_UINT32					uHash;

+    uint32_t					uHash;

     FX_LPCWSTR					pName;

     XFA_ATTRIBUTEENUM			eName;

 } XFA_ATTRIBUTEENUMINFO, * XFA_LPATTRIBUTEENUMINFO;

@@ -1049,12 +1049,12 @@ class CFXJSE_Arguments;
 class CXFA_Object;

 typedef void (CXFA_Object::*XFA_METHOD_CALLBACK) (CFXJSE_Arguments* pArguments);

 typedef struct _XFA_METHODINFO {

-    FX_UINT32					uHash;

+    uint32_t					uHash;

     FX_LPCWSTR					pName;

     XFA_METHOD_CALLBACK			lpfnCallback;

 } XFA_METHODINFO, * XFA_LPMETHODINFO;

 typedef XFA_METHODINFO const * XFA_LPCMETHODINFO;

-FX_INT32 XFA_GetMethodCount();

+int32_t XFA_GetMethodCount();

 XFA_LPCMETHODINFO XFA_GetMethodByName(XFA_ELEMENT eElement,	FX_WSTR wsMethodName);

 typedef void (CXFA_Object::*XFA_ATTRIBUTE_CALLBACK) (FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute);

 enum XFA_SCRIPT_TYPE {

@@ -1062,10 +1062,10 @@ enum XFA_SCRIPT_TYPE {
     XFA_SCRIPT_Object,

 };

 typedef struct _XFA_SCRIPTATTRIBUTEINFO {

-    FX_UINT32						uHash;

+    uint32_t						uHash;

     FX_LPCWSTR						pName;

     XFA_ATTRIBUTE_CALLBACK			lpfnCallback;

-    FX_INT32						eAttribute;

+    int32_t						eAttribute;

     FX_WORD							eValueType;

 } XFA_SCRIPTATTRIBUTEINFO, * XFA_LPSCRIPTATTRIBUTEINFO;

 typedef XFA_SCRIPTATTRIBUTEINFO const * XFA_LPCSCRIPTATTRIBUTEINFO;

diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h
index d78a87dd64..888000805f 100644
--- a/xfa/include/fxfa/fxfa_objectacc.h
+++ b/xfa/include/fxfa/fxfa_objectacc.h
@@ -89,28 +89,28 @@ public:
     CXFA_Fill(CXFA_Node* pNode);

     ~CXFA_Fill();

 

-    FX_INT32		GetPresence();

+    int32_t		GetPresence();

 

     FX_ARGB			GetColor(FX_BOOL bText = FALSE);

 

     void			SetColor(FX_ARGB color);

 

 

-    FX_INT32		GetFillType();

+    int32_t		GetFillType();

 

-    FX_INT32		GetPattern(FX_ARGB& foreColor);

+    int32_t		GetPattern(FX_ARGB& foreColor);

 

-    FX_INT32		GetStipple(FX_ARGB& stippleColor);

+    int32_t		GetStipple(FX_ARGB& stippleColor);

 

-    FX_INT32		GetLinear(FX_ARGB& endColor);

+    int32_t		GetLinear(FX_ARGB& endColor);

 

-    FX_INT32		GetRadial(FX_ARGB& endColor);

-    FX_BOOL			SetPresence(FX_INT32 iPresence);

-    FX_BOOL			SetFillType(FX_INT32 iType);

-    FX_BOOL			SetPattern(FX_INT32 iPattern, FX_ARGB foreColor);

-    FX_BOOL			SetStipple(FX_INT32 iStipple, FX_ARGB stippleColor);

-    FX_BOOL			SetLinear(FX_INT32 iLinear, FX_ARGB endColor);

-    FX_BOOL			SetRadial(FX_INT32 iRadial, FX_ARGB endColor);

+    int32_t		GetRadial(FX_ARGB& endColor);

+    FX_BOOL			SetPresence(int32_t iPresence);

+    FX_BOOL			SetFillType(int32_t iType);

+    FX_BOOL			SetPattern(int32_t iPattern, FX_ARGB foreColor);

+    FX_BOOL			SetStipple(int32_t iStipple, FX_ARGB stippleColor);

+    FX_BOOL			SetLinear(int32_t iLinear, FX_ARGB endColor);

+    FX_BOOL			SetRadial(int32_t iRadial, FX_ARGB endColor);

 };

 class CXFA_Margin : public CXFA_Data

 {

@@ -138,17 +138,17 @@ public:
 

     FX_FLOAT		GetLetterSpacing();

 

-    FX_INT32		GetLineThrough();

+    int32_t		GetLineThrough();

 

-    FX_INT32		GetLineThroughPeriod();

+    int32_t		GetLineThroughPeriod();

 

-    FX_INT32		GetOverline();

+    int32_t		GetOverline();

 

-    FX_INT32		GetOverlinePeriod();

+    int32_t		GetOverlinePeriod();

 

-    FX_INT32		GetUnderline();

+    int32_t		GetUnderline();

 

-    FX_INT32		GetUnderlinePeriod();

+    int32_t		GetUnderlinePeriod();

 

     FX_FLOAT		GetFontSize();

 

@@ -167,21 +167,21 @@ public:
     FX_BOOL			SetHorizontalScale(FX_FLOAT fHorizontalScale);

     FX_BOOL			SetVerticalScale(FX_FLOAT fVerticalScale);

     FX_BOOL			SetLetterSpacing(FX_FLOAT fLetterSpacing, XFA_UNIT eUnit);

-    FX_BOOL			SetLineThrough(FX_INT32 iLineThrough);

-    FX_BOOL			SetLineThroughPeriod(FX_INT32 iLineThroughPeriod);

-    FX_BOOL			SetOverline(FX_INT32 iOverline);

-    FX_BOOL			SetOverlinePeriod(FX_INT32 iOverlinePeriod);

-    FX_BOOL			SetUnderline(FX_INT32 iUnderline);

-    FX_BOOL			SetUnderlinePeriod(FX_INT32 iUnderlinePeriod);

+    FX_BOOL			SetLineThrough(int32_t iLineThrough);

+    FX_BOOL			SetLineThroughPeriod(int32_t iLineThroughPeriod);

+    FX_BOOL			SetOverline(int32_t iOverline);

+    FX_BOOL			SetOverlinePeriod(int32_t iOverlinePeriod);

+    FX_BOOL			SetUnderline(int32_t iUnderline);

+    FX_BOOL			SetUnderlinePeriod(int32_t iUnderlinePeriod);

 };

 class CXFA_Caption : public CXFA_Data

 {

 public:

     CXFA_Caption(CXFA_Node* pNode);

 

-    FX_INT32		GetPresence();

+    int32_t		GetPresence();

 

-    FX_INT32		GetPlacementType();

+    int32_t		GetPlacementType();

 

     FX_FLOAT		GetReserve();

 

@@ -192,8 +192,8 @@ public:
     CXFA_Value		GetValue();

 

     CXFA_Para		GetPara();

-    FX_BOOL			SetPresence(FX_INT32 iPresence);

-    FX_BOOL			SetPlacementType(FX_INT32 iType);

+    FX_BOOL			SetPresence(int32_t iPresence);

+    FX_BOOL			SetPlacementType(int32_t iType);

     FX_BOOL			SetReserve(FX_FLOAT fReserve);

 };

 class CXFA_Para : public CXFA_Data

@@ -201,42 +201,42 @@ class CXFA_Para : public CXFA_Data
 public:

     CXFA_Para(CXFA_Node* pNode);

 

-    FX_INT32		GetHorizontalAlign();

+    int32_t		GetHorizontalAlign();

 

-    FX_INT32		GetVerticalAlign();

+    int32_t		GetVerticalAlign();

 

     FX_FLOAT		GetLineHeight();

     FX_FLOAT		GetMarginLeft();

     FX_FLOAT		GetMarginRight();

-    FX_INT32		GetOrphans();

+    int32_t		GetOrphans();

     FX_FLOAT		GetRadixOffset();

     FX_FLOAT		GetSpaceAbove();

     FX_FLOAT		GetSpaceBelow();

     FX_FLOAT		GetTextIndent();

-    FX_INT32		GetWidows();

-    FX_BOOL			SetHorizontalAlign(FX_INT32 iHorizontalAlign);

-    FX_BOOL			SetVerticalAlign(FX_INT32 iVerticalAlign);

+    int32_t		GetWidows();

+    FX_BOOL			SetHorizontalAlign(int32_t iHorizontalAlign);

+    FX_BOOL			SetVerticalAlign(int32_t iVerticalAlign);

     FX_BOOL			SetLineHeight(FX_FLOAT fLineHeight);

     FX_BOOL			SetMarginLeft(FX_FLOAT fMarginLeft);

     FX_BOOL			SetMarginRight(FX_FLOAT fMarginRight);

-    FX_BOOL			SetOrphans(FX_INT32 iOrphans);

+    FX_BOOL			SetOrphans(int32_t iOrphans);

     FX_BOOL			SetRadixOffset(FX_FLOAT fRadixOffset);

     FX_BOOL			SetSpaceAbove(FX_FLOAT fSpaceAbove);

     FX_BOOL			SetSpaceBelow(FX_FLOAT fSpaceBelow);

     FX_BOOL			SetTextIndent(FX_FLOAT fTextIndent);

-    FX_BOOL			SetWidows(FX_INT32 iWidows);

+    FX_BOOL			SetWidows(int32_t iWidows);

 };

 class CXFA_Keep : public CXFA_Data

 {

 public:

     CXFA_Keep(CXFA_Node *pNode, CXFA_Node *pParent);

 

-    FX_INT32		GetIntact();

-    FX_INT32		GetNext();

-    FX_INT32		GetPrevious();

-    FX_BOOL			SetIntact(FX_INT32 iIntact);

-    FX_BOOL			SetNext(FX_INT32 iNext);

-    FX_BOOL			SetPrevious(FX_INT32 iPrevious);

+    int32_t		GetIntact();

+    int32_t		GetNext();

+    int32_t		GetPrevious();

+    FX_BOOL			SetIntact(int32_t iIntact);

+    FX_BOOL			SetNext(int32_t iNext);

+    FX_BOOL			SetPrevious(int32_t iPrevious);

 private:

     CXFA_Node		*m_pParent;

 };

@@ -260,13 +260,13 @@ public:
     CXFA_Event(CXFA_Node* pNode);

 

 

-    FX_INT32			GetActivity();

+    int32_t			GetActivity();

 

-    FX_INT32			GetEventType();

+    int32_t			GetEventType();

     void				GetRef(CFX_WideStringC &wsRef);

 

-    FX_INT32			GetExecuteRunAt();

-    FX_INT32			GetExecuteType();

+    int32_t			GetExecuteRunAt();

+    int32_t			GetExecuteType();

     void				GetExecuteConnection(CFX_WideString &wsConnection);

 

 

@@ -276,14 +276,14 @@ public:
     CXFA_Submit			GetSubmit();

 

 

-    FX_INT32			GetSignDataOperation();

+    int32_t			GetSignDataOperation();

     void				GetSignDataTarget(CFX_WideString &wsTarget);

-    FX_BOOL				SetActivity(FX_INT32 iActivity);

-    FX_BOOL				SetEventType(FX_INT32 iEventType);

-    FX_BOOL				SetExecuteRunAt(FX_INT32 iExecuteRunAt);

-    FX_BOOL				SetExecuteType(FX_INT32 iExecuteType);

+    FX_BOOL				SetActivity(int32_t iActivity);

+    FX_BOOL				SetEventType(int32_t iEventType);

+    FX_BOOL				SetExecuteRunAt(int32_t iExecuteRunAt);

+    FX_BOOL				SetExecuteType(int32_t iExecuteType);

     FX_BOOL				SetExecuteConnection(const CFX_WideString& wsConnection);

-    FX_BOOL				SetSignDataOperation(FX_INT32 iOperation);

+    FX_BOOL				SetSignDataOperation(int32_t iOperation);

     FX_BOOL				SetSignDataTarget(const CFX_WideString& wsTarget);

 };

 enum XFA_SCRIPTTYPE {

@@ -298,11 +298,11 @@ public:
     void				GetBinding(CFX_WideString &wsBinding);

 

     XFA_SCRIPTTYPE		GetContentType();

-    FX_INT32			GetRunAt();

+    int32_t			GetRunAt();

     void				GetExpression(CFX_WideString &wsExpression);

     FX_BOOL				SetBinding(const CFX_WideString& wsBinding);

     FX_BOOL				SetContentType(XFA_SCRIPTTYPE eType);

-    FX_BOOL				SetRunAt(FX_INT32 iRunAt);

+    FX_BOOL				SetRunAt(int32_t iRunAt);

     FX_BOOL				SetExpression(const CFX_WideString& wsExpression);

 };

 class CXFA_Submit : public CXFA_Data

@@ -310,11 +310,11 @@ class CXFA_Submit : public CXFA_Data
 public:

     CXFA_Submit(CXFA_Node* pNode);

     FX_BOOL				IsSubmitEmbedPDF();

-    FX_INT32			GetSubmitFormat();

+    int32_t			GetSubmitFormat();

     void				GetSubmitTarget(CFX_WideStringC &wsTarget);

     XFA_TEXTENCODING	GetSubmitTextEncoding();

     void				GetSubmitXDPContent(CFX_WideStringC &wsContent);

-    FX_BOOL				SetSubmitFormat(FX_INT32 iSubmitFormat);

+    FX_BOOL				SetSubmitFormat(int32_t iSubmitFormat);

     FX_BOOL				SetSubmitTarget(const CFX_WideString& wsTarget);

     FX_BOOL				SetSubmitTextEncoding(XFA_TEXTENCODING eTextEncoding);

     FX_BOOL				SetSubmitXDPContent(const CFX_WideString& wsContent);

@@ -339,23 +339,23 @@ class CXFA_Line : public CXFA_Data
 {

 public:

     CXFA_Line(CXFA_Node* pNode) : CXFA_Data(pNode) {}

-    FX_INT32		GetHand();

+    int32_t		GetHand();

     FX_BOOL			GetSlop();

     CXFA_Edge		GetEdge();

-    FX_BOOL			SetHand(FX_INT32 iHand);

-    FX_BOOL			SetSlop(FX_INT32 iSlop);

+    FX_BOOL			SetHand(int32_t iHand);

+    FX_BOOL			SetSlop(int32_t iSlop);

 };

 class CXFA_Text : public CXFA_Data

 {

 public:

     CXFA_Text(CXFA_Node* pNode);

     void		GetName(CFX_WideStringC &wsName);

-    FX_INT32	GetMaxChars();

+    int32_t	GetMaxChars();

     void		GetRid(CFX_WideStringC &wsRid);

     void		GetContent(CFX_WideString &wsText);

     void		SetContent(CFX_WideString wsText, FX_BOOL bNotify = TRUE);

     FX_BOOL		SetName(const CFX_WideString& wsName);

-    FX_BOOL		SetMaxChars(FX_INT32 iMaxChars);

+    FX_BOOL		SetMaxChars(int32_t iMaxChars);

     FX_BOOL		SetRid(const CFX_WideString& wsRid);

 };

 class CXFA_ExData : public CXFA_Data

@@ -364,30 +364,30 @@ public:
     CXFA_ExData(CXFA_Node* pNode);

     void		GetContentType(CFX_WideStringC &wsContentType);

     void		GetHref(CFX_WideStringC &wsHref);

-    FX_INT32	GetMaxLength();

+    int32_t	GetMaxLength();

     void		GetRid(CFX_WideStringC &wsRid);

-    FX_INT32	GetTransferEncoding();

+    int32_t	GetTransferEncoding();

     void		GetContent(CFX_WideString &wsText);

     FX_BOOL		SetContentType(const CFX_WideString& wsContentType);

     FX_BOOL		SetHref(const CFX_WideString& wsHref);

-    FX_BOOL		SetMaxLength(FX_INT32 iMaxLength);

+    FX_BOOL		SetMaxLength(int32_t iMaxLength);

     FX_BOOL		SetRid(const CFX_WideString& wsRid);

-    FX_BOOL		SetTransferEncoding(FX_INT32 iTransferEncoding);

+    FX_BOOL		SetTransferEncoding(int32_t iTransferEncoding);

     FX_BOOL		SetContent(const CFX_WideString& wsText, FX_BOOL bNotify = FALSE,  FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);

 };

 class CXFA_Image : public CXFA_Data

 {

 public:

     CXFA_Image(CXFA_Node* pNode, FX_BOOL bDefValue);

-    FX_INT32	GetAspect();

+    int32_t	GetAspect();

     FX_BOOL		GetContentType(CFX_WideString &wsContentType);

     FX_BOOL		GetHref(CFX_WideString &wsHref);

-    FX_INT32	GetTransferEncoding();

+    int32_t	GetTransferEncoding();

     FX_BOOL		GetContent(CFX_WideString &wsText);

-    FX_BOOL		SetAspect(FX_INT32 iAspect);

+    FX_BOOL		SetAspect(int32_t iAspect);

     FX_BOOL		SetContentType(const CFX_WideString& wsContentType);

     FX_BOOL		SetHref(const CFX_WideString& wsHref);

-    FX_BOOL		SetTransferEncoding(FX_INT32 iTransferEncoding);

+    FX_BOOL		SetTransferEncoding(int32_t iTransferEncoding);

     FX_BOOL		SetContent(const CFX_WideString& wsText);

 protected:

     FX_BOOL		m_bDefValue;

@@ -397,21 +397,21 @@ class CXFA_Calculate : public CXFA_Data
 public:

     CXFA_Calculate(CXFA_Node* pNode);

 

-    FX_INT32		GetOverride();

+    int32_t		GetOverride();

     CXFA_Script		GetScript();

     void			GetMessageText(CFX_WideString &wsMessage);

-    FX_BOOL			SetOverride(FX_INT32 iOverride);

+    FX_BOOL			SetOverride(int32_t iOverride);

     FX_BOOL			SetMessageText(const CFX_WideString& wsMessage);

 };

 class CXFA_Validate : public CXFA_Data

 {

 public:

     CXFA_Validate(CXFA_Node* pNode);

-    FX_INT32	GetFormatTest();

+    int32_t	GetFormatTest();

     FX_BOOL		SetFormatTest(CFX_WideString wsValue);

-    FX_INT32	GetNullTest();

+    int32_t	GetNullTest();

     FX_BOOL		SetNullTest(CFX_WideString wsValue);

-    FX_INT32	GetScriptTest();

+    int32_t	GetScriptTest();

     void			GetFormatMessageText(CFX_WideString &wsMessage);

     void			SetFormatMessageText(CFX_WideString wsMessage);

     void			GetNullMessageText(CFX_WideString &wsMessage);

@@ -423,24 +423,24 @@ public:
 protected:

     void		GetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType);

     void		SetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType);

-    FX_BOOL		SetTestValue(FX_INT32 iType, CFX_WideString &wsValue, XFA_ATTRIBUTEENUM eName);

+    FX_BOOL		SetTestValue(int32_t iType, CFX_WideString &wsValue, XFA_ATTRIBUTEENUM eName);

 };

 class CXFA_Variables : public CXFA_Data

 {

 public:

     CXFA_Variables(CXFA_Node* pNode);

 

-    FX_INT32	CountScripts();

-    CXFA_Script	GetScript(FX_INT32 nIndex);

+    int32_t	CountScripts();

+    CXFA_Script	GetScript(int32_t nIndex);

 };

 class CXFA_Bind : public CXFA_Data

 {

 public:

     CXFA_Bind(CXFA_Node* pNode);

-    FX_INT32	GetMatch();

+    int32_t	GetMatch();

     void		GetRef(CFX_WideStringC &wsRef);

     void		GetPicture(CFX_WideString &wsPicture);

-    FX_BOOL		SetMatch(FX_INT32 iMatch);

+    FX_BOOL		SetMatch(int32_t iMatch);

     FX_BOOL		SetRef(const CFX_WideString& wsRef);

     FX_BOOL		SetPicture(const CFX_WideString& wsPicture);

 };

@@ -489,15 +489,15 @@ public:
         return GetClassID() == XFA_ELEMENT_Edge;

     }

 

-    FX_INT32		GetPresence() const;

+    int32_t		GetPresence() const;

     FX_BOOL			IsVisible() const

     {

         return GetPresence() == XFA_ATTRIBUTEENUM_Visible;

     }

 

-    FX_INT32		GetCapType() const;

+    int32_t		GetCapType() const;

 

-    FX_INT32		GetStrokeType() const;

+    int32_t		GetStrokeType() const;

 

     FX_FLOAT		GetThickness() const;

     CXFA_Measurement GetMSThickness() const;

@@ -509,7 +509,7 @@ public:
 

     void			SetColor(FX_ARGB argb);

 

-    FX_INT32		GetJoinType() const;

+    int32_t		GetJoinType() const;

 

     FX_BOOL			IsInverted() const;

 

@@ -551,19 +551,19 @@ public:
         return GetClassID() == XFA_ELEMENT_Rectangle;

     }

 

-    FX_INT32		GetBreak() const;

+    int32_t		GetBreak() const;

 

-    FX_INT32		GetHand() const;

+    int32_t		GetHand() const;

 

-    FX_INT32		GetPresence() const;

+    int32_t		GetPresence() const;

 

-    FX_INT32		CountCorners() const;

+    int32_t		CountCorners() const;

 

-    CXFA_Corner		GetCorner(FX_INT32 nIndex) const;

+    CXFA_Corner		GetCorner(int32_t nIndex) const;

 

-    FX_INT32		CountEdges() const;

+    int32_t		CountEdges() const;

 

-    CXFA_Edge		GetEdge(FX_INT32 nIndex = 0) const;

+    CXFA_Edge		GetEdge(int32_t nIndex = 0) const;

 

     void			GetStrokes(CXFA_StrokeArray &strokes) const;

 

@@ -591,7 +591,7 @@ public:
 

     FX_BOOL			SameStyles() const;

 

-    FX_INT32		Get3DStyle(FX_BOOL &bVisible, FX_FLOAT &fThickness) const;

+    int32_t		Get3DStyle(FX_BOOL &bVisible, FX_FLOAT &fThickness) const;

 };

 class CXFA_Arc : public CXFA_Box

 {

@@ -627,12 +627,12 @@ public:
 

     XFA_ELEMENT         GetUIType();

     CFX_WideString      GetRawValue();

-    FX_INT32            GetAccess(FX_BOOL bTemplate = FALSE);

+    int32_t            GetAccess(FX_BOOL bTemplate = FALSE);

     FX_BOOL             GetAccessKey(CFX_WideStringC &wsAccessKey);

-    FX_INT32            GetAnchorType();

-    FX_INT32            GetColSpan();

-    FX_INT32            GetPresence();

-    FX_INT32            GetRotate();

+    int32_t            GetAnchorType();

+    int32_t            GetColSpan();

+    int32_t            GetPresence();

+    int32_t            GetRotate();

     CXFA_Border         GetBorder(FX_BOOL bModified = FALSE);

     CXFA_Caption        GetCaption(FX_BOOL bModified = FALSE);

     CXFA_Font           GetFont(FX_BOOL bModified = FALSE);

@@ -640,7 +640,7 @@ public:
     CXFA_Para           GetPara(FX_BOOL bModified = FALSE);

     CXFA_Keep           GetKeep(FX_BOOL bModified = FALSE);

     void                GetEventList(CXFA_NodeArray &events);

-    FX_INT32            GetEventByActivity(FX_INT32 iActivity,

+    int32_t            GetEventByActivity(int32_t iActivity,

                                            CXFA_NodeArray &events,

                                            FX_BOOL bIsFormReady = FALSE);

     CXFA_Value          GetDefaultValue(FX_BOOL bModified = FALSE);

@@ -659,12 +659,12 @@ public:
     FX_BOOL             GetMaxWidth(FX_FLOAT &fMaxWidth);

     FX_BOOL             GetMaxHeight(FX_FLOAT &fMaxHeight);

     CXFA_BindItems      GetBindItems();

-    FX_BOOL             SetAccess(FX_INT32 iAccess, FX_BOOL bNotify = TRUE);

+    FX_BOOL             SetAccess(int32_t iAccess, FX_BOOL bNotify = TRUE);

     FX_BOOL             SetAccessKey(const CFX_WideString& wsAccessKey);

-    FX_BOOL             SetAnchorType(FX_INT32 iType);

-    FX_BOOL             SetColSpan(FX_INT32 iColSpan);

-    FX_BOOL             SetPresence(FX_INT32 iPresence);

-    FX_BOOL             SetRotate(FX_INT32 iRotate);

+    FX_BOOL             SetAnchorType(int32_t iType);

+    FX_BOOL             SetColSpan(int32_t iColSpan);

+    FX_BOOL             SetPresence(int32_t iPresence);

+    FX_BOOL             SetRotate(int32_t iRotate);

     FX_BOOL             SetRelevant(const CFX_WideString& wsRelevant);

     FX_BOOL             SetStatus(FX_DWORD dwStatus);

     FX_BOOL             SetWidth(FX_FLOAT fWidth);

@@ -675,20 +675,20 @@ public:
     FX_BOOL             SetMaxHeight(FX_FLOAT fMaxHeight);

     FX_BOOL             SetPos(FX_FLOAT x, FX_FLOAT y);

     FX_BOOL             SetName(const CFX_WideString& wsName);

-    FX_BOOL             SetButtonHighlight(FX_INT32 iButtonHighlight);

+    FX_BOOL             SetButtonHighlight(int32_t iButtonHighlight);

     FX_BOOL             SetButtonRollover(const CFX_WideString &wsRollover, FX_BOOL bRichText);

     FX_BOOL             SetButtonDown(const CFX_WideString& wsDown, FX_BOOL bRichText);

-    FX_BOOL             SetCheckButtonShape(FX_INT32 iCheckButtonShape);

-    FX_BOOL             SetCheckButtonMark(FX_INT32 iCheckButtonMark);

+    FX_BOOL             SetCheckButtonShape(int32_t iCheckButtonShape);

+    FX_BOOL             SetCheckButtonMark(int32_t iCheckButtonMark);

     FX_BOOL             SetCheckButtonSize(FX_FLOAT fCheckButtonMark);

     CXFA_Border         GetUIBorder(FX_BOOL bModified = FALSE);

     CXFA_Margin         GetUIMargin(FX_BOOL bModified = FALSE);

     void                GetUIMargin(CFX_RectF &rtUIMargin);

-    FX_INT32            GetButtonHighlight();

+    int32_t            GetButtonHighlight();

     FX_BOOL             GetButtonRollover(CFX_WideString &wsRollover, FX_BOOL &bRichText);

     FX_BOOL             GetButtonDown(CFX_WideString &wsDown, FX_BOOL &bRichText);

-    FX_INT32            GetCheckButtonShape();

-    FX_INT32            GetCheckButtonMark();

+    int32_t            GetCheckButtonShape();

+    int32_t            GetCheckButtonMark();

     FX_FLOAT            GetCheckButtonSize();

     FX_BOOL             IsAllowNeutral();

     FX_BOOL             IsRadioButton();

@@ -703,32 +703,32 @@ public:
                                                  FX_BOOL bSyncData = TRUE);

     CXFA_Node*          GetExclGroupFirstMember();

     CXFA_Node*          GetExclGroupNextMember(CXFA_Node* pNode);

-    FX_INT32            GetChoiceListCommitOn();

+    int32_t            GetChoiceListCommitOn();

     FX_BOOL             IsChoiceListAllowTextEntry();

-    FX_INT32            GetChoiceListOpen();

+    int32_t            GetChoiceListOpen();

     FX_BOOL             IsListBox();

-    FX_INT32            CountChoiceListItems(FX_BOOL bSaveValue = FALSE);

-    FX_BOOL             GetChoiceListItem(CFX_WideString &wsText, FX_INT32 nIndex, FX_BOOL bSaveValue = FALSE);

+    int32_t            CountChoiceListItems(FX_BOOL bSaveValue = FALSE);

+    FX_BOOL             GetChoiceListItem(CFX_WideString &wsText, int32_t nIndex, FX_BOOL bSaveValue = FALSE);

     void                GetChoiceListItems(CFX_WideStringArray &wsTextArray, FX_BOOL bSaveValue = FALSE);

-    FX_INT32            CountSelectedItems();

-    FX_INT32            GetSelectedItem(FX_INT32 nIndex = 0);

+    int32_t            CountSelectedItems();

+    int32_t            GetSelectedItem(int32_t nIndex = 0);

     void                GetSelectedItems(CFX_Int32Array &iSelArray);

     void                GetSelectedItemsValue(CFX_WideStringArray &wsSelTextArray);

-    FX_BOOL             GetItemState(FX_INT32 nIndex);

-    void                SetItemState(FX_INT32 nIndex, FX_BOOL bSelected, 

+    FX_BOOL             GetItemState(int32_t nIndex);

+    void                SetItemState(int32_t nIndex, FX_BOOL bSelected, 

                                      FX_BOOL bNotify = FALSE, FX_BOOL bScriptModify = FALSE, 

                                      FX_BOOL bSyncData = TRUE);

     void                SetSelectdItems(CFX_Int32Array &iSelArray, FX_BOOL bNotify = FALSE,

                                         FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);

     void                ClearAllSelections();

     void                InsertItem(const CFX_WideString &wsLabel, const CFX_WideString &wsValue,

-                                   FX_INT32 nIndex = -1, FX_BOOL bNotify = FALSE);

+                                   int32_t nIndex = -1, FX_BOOL bNotify = FALSE);

     void                GetItemLabel(FX_WSTR wsValue, CFX_WideString &wsLabel);

     void                GetItemValue(FX_WSTR wsLabel, CFX_WideString &wsValue);

-    FX_BOOL             DeleteItem(FX_INT32 nIndex, FX_BOOL bNotify = FALSE,

+    FX_BOOL             DeleteItem(int32_t nIndex, FX_BOOL bNotify = FALSE,

                                    FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);

-    FX_INT32            GetHorizontalScrollPolicy();

-    FX_INT32            GetNumberOfCells();

+    int32_t            GetHorizontalScrollPolicy();

+    int32_t            GetNumberOfCells();

     FX_BOOL             IsDateTimeEditUsePicker();

     FX_BOOL             SetValue(const CFX_WideString& wsValue, XFA_VALUEPICTURE eValueType);

     FX_BOOL             GetPictureContent(CFX_WideString &wsPicture, XFA_VALUEPICTURE ePicture);

@@ -738,25 +738,25 @@ public:
     FX_BOOL             GetFormatDataValue(FX_WSTR wsValue, CFX_WideString &wsFormatedValue);

     void                NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput);

     CFX_WideString      GetBarcodeType();

-    FX_BOOL             GetBarcodeAttribute_CharEncoding(FX_INT32& val);

-    FX_BOOL             GetBarcodeAttribute_Checksum(FX_INT32& val);

-    FX_BOOL             GetBarcodeAttribute_DataLength(FX_INT32& val);

+    FX_BOOL             GetBarcodeAttribute_CharEncoding(int32_t& val);

+    FX_BOOL             GetBarcodeAttribute_Checksum(int32_t& val);

+    FX_BOOL             GetBarcodeAttribute_DataLength(int32_t& val);

     FX_BOOL             GetBarcodeAttribute_StartChar(FX_CHAR& val);

     FX_BOOL             GetBarcodeAttribute_EndChar(FX_CHAR& val);

-    FX_BOOL             GetBarcodeAttribute_ECLevel(FX_INT32& val);

-    FX_BOOL             GetBarcodeAttribute_ModuleWidth(FX_INT32& val);

-    FX_BOOL             GetBarcodeAttribute_ModuleHeight(FX_INT32& val);

+    FX_BOOL             GetBarcodeAttribute_ECLevel(int32_t& val);

+    FX_BOOL             GetBarcodeAttribute_ModuleWidth(int32_t& val);

+    FX_BOOL             GetBarcodeAttribute_ModuleHeight(int32_t& val);

     FX_BOOL             GetBarcodeAttribute_PrintChecksum(FX_BOOL& val);

-    FX_BOOL             GetBarcodeAttribute_TextLocation(FX_INT32& val);

+    FX_BOOL             GetBarcodeAttribute_TextLocation(int32_t& val);

     FX_BOOL             GetBarcodeAttribute_Truncate(FX_BOOL& val);

     FX_BOOL             GetBarcodeAttribute_WideNarrowRatio(FX_FLOAT& val);

     void                GetPasswordChar(CFX_WideString &wsPassWord);

     FX_BOOL             IsAllowRichText();

     FX_BOOL             IsMultiLine();

-    FX_INT32            GetVerticalScrollPolicy();

-    FX_INT32            GetMaxChars(XFA_ELEMENT& eType);

-    FX_BOOL             GetFracDigits(FX_INT32 &iFracDigits);

-    FX_BOOL             GetLeadDigits(FX_INT32 &iLeadDigits);

+    int32_t            GetVerticalScrollPolicy();

+    int32_t            GetMaxChars(XFA_ELEMENT& eType);

+    FX_BOOL             GetFracDigits(int32_t &iFracDigits);

+    FX_BOOL             GetLeadDigits(int32_t &iLeadDigits);

     CXFA_Filter         GetFilter(FX_BOOL bModified = FALSE);

     CXFA_Manifest       GetManifest(FX_BOOL bModified = FALSE);

 

@@ -764,7 +764,7 @@ public:
     FX_BOOL             m_bPreNull;

 protected:

     void                SyncValue(const CFX_WideString& wsValue, FX_BOOL bNotify);

-    void                InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, FX_INT32 nIndex = -1);

+    void                InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, int32_t nIndex = -1);

     void                FormatNumStr(const CFX_WideString& wsValue, IFX_Locale* pLocale, CFX_WideString& wsOutput);

 

     CXFA_Node*          m_pUiChildNode;

@@ -774,12 +774,12 @@ class CXFA_Occur : public CXFA_Data
 {

 public:

     CXFA_Occur(CXFA_Node* pNode);

-    FX_INT32	GetMax();

-    FX_INT32	GetMin();

-    FX_INT32	GetInitial();

-    FX_BOOL		GetOccurInfo(FX_INT32& iMin, FX_INT32& iMax, FX_INT32& iInit);

-    void		SetMax(FX_INT32 iMax);

-    void		SetMin(FX_INT32 iMin);

+    int32_t	GetMax();

+    int32_t	GetMin();

+    int32_t	GetInitial();

+    FX_BOOL		GetOccurInfo(int32_t& iMin, int32_t& iMax, int32_t& iInit);

+    void		SetMax(int32_t iMax);

+    void		SetMin(int32_t iMin);

 };

 class CXFA_Filter : public CXFA_Data

 {

@@ -803,7 +803,7 @@ public:
     CFX_WideString			GetHandlerContent();

     XFA_ATTRIBUTEENUM		GetlockDocumentType();

     CFX_WideString			GetlockDocumentContent();

-    FX_INT32				GetMDPPermissions();

+    int32_t				GetMDPPermissions();

     XFA_ATTRIBUTEENUM		GetMDPSignatureType();

 

     CXFA_Reasons			GetReasons(FX_BOOL bModified = FALSE);

@@ -822,64 +822,64 @@ class CXFA_WrapCertificate : public CXFA_Data
 public:

     CXFA_WrapCertificate(CXFA_Node* pNode) : CXFA_Data(pNode) {}

     XFA_ATTRIBUTEENUM	GetType();

-    FX_INT32			CountCertificates();

-    CXFA_Certificate	GetCertificate(FX_INT32 nIndex);

+    int32_t			CountCertificates();

+    CXFA_Certificate	GetCertificate(int32_t nIndex);

 };

 class CXFA_Oids : public CXFA_Data

 {

 public:

     CXFA_Oids(CXFA_Node* pNode) : CXFA_Data(pNode) {}

     XFA_ATTRIBUTEENUM	GetOidsType();

-    FX_INT32			CountOids();

-    CFX_WideString		GetOidContent(FX_INT32 nIndex);

+    int32_t			CountOids();

+    CFX_WideString		GetOidContent(int32_t nIndex);

 };

 class CXFA_SubjectDNs : public CXFA_Data

 {

 public:

     CXFA_SubjectDNs(CXFA_Node* pNode) : CXFA_Data(pNode) {}

     XFA_ATTRIBUTEENUM	GetSubjectDNsType();

-    FX_INT32				CountSubjectDNs();

-    CFX_WideString			GetSubjectDNString(FX_INT32 nIndex, XFA_ATTRIBUTE eAttribute);

-    CFX_WideString			GetSubjectDNContent(FX_INT32 nIndex);

+    int32_t				CountSubjectDNs();

+    CFX_WideString			GetSubjectDNString(int32_t nIndex, XFA_ATTRIBUTE eAttribute);

+    CFX_WideString			GetSubjectDNContent(int32_t nIndex);

 };

 class CXFA_DigestMethods : public CXFA_Data

 {

 public:

     CXFA_DigestMethods(CXFA_Node* pNode) : CXFA_Data(pNode) {}

     XFA_ATTRIBUTEENUM	GetDigestMethodsType();

-    FX_INT32				CountDigestMethods();

-    CFX_WideString			GetDigestMethodContent(FX_INT32 nIndex);

+    int32_t				CountDigestMethods();

+    CFX_WideString			GetDigestMethodContent(int32_t nIndex);

 };

 class CXFA_Encodings : public CXFA_Data

 {

 public:

     CXFA_Encodings(CXFA_Node* pNode) : CXFA_Data(pNode) {}

     XFA_ATTRIBUTEENUM		GetEncodingsType();

-    FX_INT32				CountEncodings();

-    CFX_WideString			GetEncodingContent(FX_INT32 nIndex);

+    int32_t				CountEncodings();

+    CFX_WideString			GetEncodingContent(int32_t nIndex);

 };

 class CXFA_EncryptionMethods : public CXFA_Data

 {

 public:

     CXFA_EncryptionMethods(CXFA_Node* pNode) : CXFA_Data(pNode) {}

     XFA_ATTRIBUTEENUM		GetEncryptionMethodsType();

-    FX_INT32				CountEncryptionMethods();

-    CFX_WideString			GetEncryptionMethodContent(FX_INT32 nIndex);

+    int32_t				CountEncryptionMethods();

+    CFX_WideString			GetEncryptionMethodContent(int32_t nIndex);

 };

 class CXFA_Reasons : public CXFA_Data

 {

 public:

     CXFA_Reasons(CXFA_Node* pNode) : CXFA_Data(pNode) {}

     XFA_ATTRIBUTEENUM		GetReasonsType();

-    FX_INT32				CountReasons();

-    CFX_WideString			GetReasonContent(FX_INT32 nIndex);

+    int32_t				CountReasons();

+    CFX_WideString			GetReasonContent(int32_t nIndex);

 };

 class CXFA_Manifest : public CXFA_Data

 {

 public:

     CXFA_Manifest(CXFA_Node* pNode) : CXFA_Data(pNode) {}

     XFA_ATTRIBUTEENUM	GetAction();

-    FX_INT32			CountReives();

-    CFX_WideString		GetRefContent(FX_INT32 nIndex);

+    int32_t			CountReives();

+    CFX_WideString		GetRefContent(int32_t nIndex);

 };

 #endif

diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h
index 4488502bf7..0ec3eaaaf4 100644
--- a/xfa/include/fxfa/fxfa_widget.h
+++ b/xfa/include/fxfa/fxfa_widget.h
@@ -25,7 +25,7 @@ public:
     CXFA_WidgetAcc(CXFA_FFDocView* pDocView, CXFA_Node* pNode);

     ~CXFA_WidgetAcc();

 

-    FX_BOOL			GetName(CFX_WideString &wsName, FX_INT32 iNameType = 0);

+    FX_BOOL			GetName(CFX_WideString &wsName, int32_t iNameType = 0);

     FX_BOOL			ProcessValueChanged();

 

 public:

@@ -41,21 +41,21 @@ public:
     CXFA_FFApp*			GetApp();

     IXFA_AppProvider*	GetAppProvider();

 

-    FX_INT32		ProcessEvent(FX_INT32 iActivity, CXFA_EventParam* pEventParam);

-    FX_INT32		ProcessEvent(CXFA_Event& event, CXFA_EventParam* pEventParam);

-    FX_INT32		ProcessCalculate();

-    FX_INT32		ProcessValidate(FX_INT32 iFlags = 0);

-    FX_INT32		ExecuteScript(CXFA_Script script, CXFA_EventParam* pEventParam, FXJSE_HVALUE* pRetValue = NULL);

+    int32_t		ProcessEvent(int32_t iActivity, CXFA_EventParam* pEventParam);

+    int32_t		ProcessEvent(CXFA_Event& event, CXFA_EventParam* pEventParam);

+    int32_t		ProcessCalculate();

+    int32_t		ProcessValidate(int32_t iFlags = 0);

+    int32_t		ExecuteScript(CXFA_Script script, CXFA_EventParam* pEventParam, FXJSE_HVALUE* pRetValue = NULL);

 

     CXFA_FFWidget*	GetNextWidget(CXFA_FFWidget* pWidget);

     void			StartWidgetLayout(FX_FLOAT &fCalcWidth, FX_FLOAT& fCalcHeight);

-    FX_BOOL			FindSplitPos(FX_INT32 iBlockIndex, FX_FLOAT &fCalcHeight);

+    FX_BOOL			FindSplitPos(int32_t iBlockIndex, FX_FLOAT &fCalcHeight);

     FX_BOOL				LoadCaption();

     FX_BOOL				LoadText();

     FX_BOOL				LoadImageImage();

     FX_BOOL				LoadImageEditImage();

-    void				GetImageDpi(FX_INT32 &iImageXDpi, FX_INT32 &iImageYDpi);

-    void				GetImageEditDpi(FX_INT32 &iImageXDpi, FX_INT32 &iImageYDpi);

+    void				GetImageDpi(int32_t &iImageXDpi, int32_t &iImageYDpi);

+    void				GetImageEditDpi(int32_t &iImageXDpi, int32_t &iImageYDpi);

     CXFA_TextLayout*	GetCaptionTextLayout();

     CXFA_TextLayout*	GetTextLayout();

     CFX_DIBitmap*		GetImageImage();

@@ -73,9 +73,9 @@ public:
     FX_FLOAT		GetLineHeight();

     CXFA_WidgetLayoutData* GetWidgetLayoutData();

 protected:

-    void			ProcessScriptTestValidate(CXFA_Validate validate, FX_INT32 iRet, FXJSE_HVALUE pRetValue, FX_BOOL bVersionFlag);

-    FX_INT32		ProcessFormatTestValidate(CXFA_Validate validate, FX_BOOL bVersionFlag);

-    FX_INT32		ProcessNullTestValidate(CXFA_Validate validate, FX_INT32 iFlags, FX_BOOL bVersionFlag);

+    void			ProcessScriptTestValidate(CXFA_Validate validate, int32_t iRet, FXJSE_HVALUE pRetValue, FX_BOOL bVersionFlag);

+    int32_t		ProcessFormatTestValidate(CXFA_Validate validate, FX_BOOL bVersionFlag);

+    int32_t		ProcessNullTestValidate(CXFA_Validate validate, int32_t iFlags, FX_BOOL bVersionFlag);

     void			GetValidateCaptionName(CFX_WideString& wsCaptionName, FX_BOOL bVersionFlag);

     void			GetValidateMessage(IXFA_AppProvider* pAppProvider, CFX_WideString& wsMessage, FX_BOOL bError, FX_BOOL bVersionFlag);

     void			CalcCaptionSize(CFX_SizeF &szCap);