summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/fpdfxfa
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/src/fpdfxfa')
-rw-r--r--fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp10
-rw-r--r--fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp10
-rw-r--r--fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp10
3 files changed, 15 insertions, 15 deletions
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
index 2c096c7145..cf5db2b3c3 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp
@@ -178,7 +178,7 @@ void CPDFXFA_App::Beep(FX_DWORD dwType)
}
}
-FX_INT32 CPDFXFA_App::MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle, FX_DWORD dwIconType, FX_DWORD dwButtonType)
+int32_t CPDFXFA_App::MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle, FX_DWORD dwIconType, FX_DWORD dwButtonType)
{
CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
if (!pEnv)
@@ -216,7 +216,7 @@ FX_INT32 CPDFXFA_App::MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle, FX_DWORD dwIcon
iButtonType |= 3;
break;
}
- FX_INT32 iRet = pEnv->JS_appAlert(wsMessage.GetPtr(), wsTitle.GetPtr(), iButtonType, iconType);
+ int32_t iRet = pEnv->JS_appAlert(wsMessage.GetPtr(), wsTitle.GetPtr(), iButtonType, iconType);
switch (iRet)
{
case 1:
@@ -250,7 +250,7 @@ void CPDFXFA_App::Response(CFX_WideString &wsAnswer, FX_WSTR wsQuestion, FX_WSTR
}
}
-FX_INT32 CPDFXFA_App::GetCurDocumentInBatch()
+int32_t CPDFXFA_App::GetCurDocumentInBatch()
{
CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
if (pEnv)
@@ -260,7 +260,7 @@ FX_INT32 CPDFXFA_App::GetCurDocumentInBatch()
return 0;
}
-FX_INT32 CPDFXFA_App::GetDocumentCountInBatch()
+int32_t CPDFXFA_App::GetDocumentCountInBatch()
{
CPDFDoc_Environment* pEnv = m_pEnvList.GetAt(0);
if (pEnv)
@@ -303,7 +303,7 @@ FX_BOOL CPDFXFA_App::PutRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsEnco
return FALSE;
}
-void CPDFXFA_App::LoadString(FX_INT32 iStringID, CFX_WideString &wsString)
+void CPDFXFA_App::LoadString(int32_t iStringID, CFX_WideString &wsString)
{
switch (iStringID)
{
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
index e64bde1a2a..106e3cbc12 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp
@@ -633,7 +633,7 @@ void CPDFXFA_Document::WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidget
}
}
-FX_INT32 CPDFXFA_Document::CountPages(IXFA_Doc* hDoc)
+int32_t CPDFXFA_Document::CountPages(IXFA_Doc* hDoc)
{
if (hDoc == m_pXFADoc && m_pSDKDoc)
{
@@ -641,7 +641,7 @@ FX_INT32 CPDFXFA_Document::CountPages(IXFA_Doc* hDoc)
}
return 0;
}
-FX_INT32 CPDFXFA_Document::GetCurrentPage(IXFA_Doc* hDoc)
+int32_t CPDFXFA_Document::GetCurrentPage(IXFA_Doc* hDoc)
{
if (hDoc != m_pXFADoc || !m_pSDKDoc)
return -1;
@@ -655,7 +655,7 @@ FX_INT32 CPDFXFA_Document::GetCurrentPage(IXFA_Doc* hDoc)
return pEnv->FFI_GetCurrentPageIndex(this);
}
-void CPDFXFA_Document::SetCurrentPage(IXFA_Doc* hDoc, FX_INT32 iCurPage)
+void CPDFXFA_Document::SetCurrentPage(IXFA_Doc* hDoc, int32_t iCurPage)
{
if (hDoc != m_pXFADoc || !m_pSDKDoc)
return;
@@ -896,7 +896,7 @@ void CPDFXFA_Document::SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget)
}
}
}
-void CPDFXFA_Document::Print(IXFA_Doc* hDoc, FX_INT32 nStartPage, FX_INT32 nEndPage, FX_DWORD dwOptions)
+void CPDFXFA_Document::Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, FX_DWORD dwOptions)
{
if (hDoc != m_pXFADoc)
return;
@@ -935,7 +935,7 @@ FX_ARGB CPDFXFA_Document::GetHighlightColor(IXFA_Doc* hDoc)
if(CPDFSDK_InterForm* pInterForm = m_pSDKDoc->GetInterForm())
{
FX_COLORREF color = pInterForm->GetHighlightColor(FPDF_FORMFIELD_XFA);
- FX_BYTE alpha = pInterForm->GetHighlightAlpha();
+ uint8_t alpha = pInterForm->GetHighlightAlpha();
FX_ARGB argb = ArgbEncode((int)alpha, color);
return argb;
}
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
index fb625d2738..ac5ef21f58 100644
--- a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
+++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp
@@ -14,7 +14,7 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer *pTimer, FX_DWORD dwElapse, FW
{
if (m_pEnv)
{
- FX_UINT32 uIDEvent = m_pEnv->FFI_SetTimer(dwElapse, TimerProc);
+ uint32_t uIDEvent = m_pEnv->FFI_SetTimer(dwElapse, TimerProc);
CFWL_TimerInfo *pInfo = FX_NEW CFWL_TimerInfo;
pInfo->uIDEvent = uIDEvent;
pInfo->pTimer = pTimer;
@@ -37,7 +37,7 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Stop(FWL_HTIMER hTimer)
m_pEnv->FFI_KillTimer(pInfo->uIDEvent);
- FX_INT32 index = ms_timerArray.Find(pInfo);
+ int32_t index = ms_timerArray.Find(pInfo);
if (index >= 0)
{
ms_timerArray.RemoveAt(index);
@@ -49,11 +49,11 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Stop(FWL_HTIMER hTimer)
return FWL_ERR_Indefinite;
}
-void CXFA_FWLAdapterTimerMgr::TimerProc(FX_INT32 idEvent)
+void CXFA_FWLAdapterTimerMgr::TimerProc(int32_t idEvent)
{
CFWL_TimerInfo *pInfo = NULL;
- FX_INT32 iCount = CXFA_FWLAdapterTimerMgr::ms_timerArray.GetSize();
- for (FX_INT32 i = 0; i < iCount; i++)
+ int32_t iCount = CXFA_FWLAdapterTimerMgr::ms_timerArray.GetSize();
+ for (int32_t i = 0; i < iCount; i++)
{
CFWL_TimerInfo *pTemp = (CFWL_TimerInfo*)CXFA_FWLAdapterTimerMgr::ms_timerArray.GetAt(i);
if (pTemp->uIDEvent == idEvent)