summaryrefslogtreecommitdiff
path: root/fpdfsdk/formfiller
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-03-25 14:52:27 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 14:52:28 -0700
commitc3255f55954b2adc3edbd3269c0a8779f7d4b7ad (patch)
tree802c0e9158e14f1e67ad181089739a176e8fba24 /fpdfsdk/formfiller
parentdeee3d2ee201d62e7ef41e7d8378d7f52e057a9c (diff)
downloadpdfium-c3255f55954b2adc3edbd3269c0a8779f7d4b7ad.tar.xz
Remove FX_DWORD from fpdfsdk/ and testing
BUG= Review URL: https://codereview.chromium.org/1835693002
Diffstat (limited to 'fpdfsdk/formfiller')
-rw-r--r--fpdfsdk/formfiller/cffl_formfiller.cpp12
-rw-r--r--fpdfsdk/formfiller/cffl_formfiller.h8
-rw-r--r--fpdfsdk/formfiller/cffl_iformfiller.cpp18
-rw-r--r--fpdfsdk/formfiller/cffl_iformfiller.h16
-rw-r--r--fpdfsdk/formfiller/cffl_listbox.cpp2
-rw-r--r--fpdfsdk/formfiller/cffl_pushbutton.cpp2
-rw-r--r--fpdfsdk/formfiller/cffl_pushbutton.h2
7 files changed, 30 insertions, 30 deletions
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index 3333f7ae99..9ca8f05493 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -78,7 +78,7 @@ void CFFL_FormFiller::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) {
+ uint32_t dwFlags) {
ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, FALSE)) {
@@ -96,7 +96,7 @@ void CFFL_FormFiller::OnDrawDeactive(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) {
+ uint32_t dwFlags) {
CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
pWidget->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
}
@@ -297,8 +297,8 @@ PWL_CREATEPARAM CFFL_FormFiller::GetCreateParam() {
cp.pProvider = this;
cp.rcRectWnd = GetPDFWindowRect();
- FX_DWORD dwCreateFlags = PWS_BORDER | PWS_BACKGROUND | PWS_VISIBLE;
- FX_DWORD dwFieldFlag = m_pWidget->GetFieldFlags();
+ uint32_t dwCreateFlags = PWS_BORDER | PWS_BACKGROUND | PWS_VISIBLE;
+ uint32_t dwFieldFlag = m_pWidget->GetFieldFlags();
if (dwFieldFlag & FIELDFLAG_READONLY) {
dwCreateFlags |= PWS_READONLY;
}
@@ -692,7 +692,7 @@ void CFFL_Button::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) {
+ uint32_t dwFlags) {
ASSERT(pPageView);
CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
CPDF_FormControl* pCtrl = pWidget->GetFormControl();
@@ -723,6 +723,6 @@ void CFFL_Button::OnDrawDeactive(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) {
+ uint32_t dwFlags) {
OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
}
diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h
index b7d8a9dad6..9e9f4becf4 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.h
+++ b/fpdfsdk/formfiller/cffl_formfiller.h
@@ -29,12 +29,12 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler {
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags);
+ uint32_t dwFlags);
virtual void OnDrawDeactive(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags);
+ uint32_t dwFlags);
virtual void OnCreate(CPDFSDK_Annot* pAnnot);
virtual void OnLoad(CPDFSDK_Annot* pAnnot);
@@ -188,12 +188,12 @@ class CFFL_Button : public CFFL_FormFiller {
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) override;
+ uint32_t dwFlags) override;
void OnDrawDeactive(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) override;
+ uint32_t dwFlags) override;
protected:
FX_BOOL m_bMouseIn;
diff --git a/fpdfsdk/formfiller/cffl_iformfiller.cpp b/fpdfsdk/formfiller/cffl_iformfiller.cpp
index 20dd5bb21b..75e57512df 100644
--- a/fpdfsdk/formfiller/cffl_iformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_iformfiller.cpp
@@ -57,7 +57,7 @@ void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) {
+ uint32_t dwFlags) {
ASSERT(pPageView);
CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
@@ -500,7 +500,7 @@ FX_BOOL CFFL_IFormFiller::IsFillingAllowed(CPDFSDK_Widget* pWidget) {
CPDF_Page* pPage = pWidget->GetPDFPage();
CPDF_Document* pDocument = pPage->m_pDocument;
- FX_DWORD dwPermissions = pDocument->GetUserPermissions();
+ uint32_t dwPermissions = pDocument->GetUserPermissions();
return (dwPermissions & FPDFPERM_FILL_FORM) ||
(dwPermissions & FPDFPERM_ANNOT_FORM) ||
(dwPermissions & FPDFPERM_MODIFY);
@@ -642,7 +642,7 @@ void CFFL_IFormFiller::OnKeyStrokeCommit(CPDFSDK_Widget* pWidget,
CPDFSDK_PageView* pPageView,
FX_BOOL& bRC,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_bNotifying) {
if (pWidget->GetAAction(CPDF_AAction::KeyStroke).GetDict()) {
m_bNotifying = TRUE;
@@ -674,7 +674,7 @@ void CFFL_IFormFiller::OnValidate(CPDFSDK_Widget* pWidget,
CPDFSDK_PageView* pPageView,
FX_BOOL& bRC,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_bNotifying) {
if (pWidget->GetAAction(CPDF_AAction::Validate).GetDict()) {
m_bNotifying = TRUE;
@@ -704,7 +704,7 @@ void CFFL_IFormFiller::OnValidate(CPDFSDK_Widget* pWidget,
void CFFL_IFormFiller::OnCalculate(CPDFSDK_Widget* pWidget,
CPDFSDK_PageView* pPageView,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_bNotifying) {
ASSERT(pWidget);
CPDFSDK_Document* pDocument = pPageView->GetSDKDocument();
@@ -719,7 +719,7 @@ void CFFL_IFormFiller::OnCalculate(CPDFSDK_Widget* pWidget,
void CFFL_IFormFiller::OnFormat(CPDFSDK_Widget* pWidget,
CPDFSDK_PageView* pPageView,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
if (!m_bNotifying) {
ASSERT(pWidget);
CPDFSDK_Document* pDocument = pPageView->GetSDKDocument();
@@ -816,7 +816,7 @@ void CFFL_IFormFiller::OnFull(CPDFSDK_Widget* pWidget,
void CFFL_IFormFiller::OnPopupPreOpen(void* pPrivateData,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
ASSERT(pData);
ASSERT(pData->pWidget);
@@ -832,7 +832,7 @@ void CFFL_IFormFiller::OnPopupPreOpen(void* pPrivateData,
void CFFL_IFormFiller::OnPopupPostOpen(void* pPrivateData,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
ASSERT(pData);
ASSERT(pData->pWidget);
@@ -933,7 +933,7 @@ void CFFL_IFormFiller::OnBeforeKeyStroke(void* pPrivateData,
FX_BOOL bKeyDown,
FX_BOOL& bRC,
FX_BOOL& bExit,
- FX_DWORD nFlag) {
+ uint32_t nFlag) {
CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
ASSERT(pData->pWidget);
diff --git a/fpdfsdk/formfiller/cffl_iformfiller.h b/fpdfsdk/formfiller/cffl_iformfiller.h
index d405b3381b..b01159475a 100644
--- a/fpdfsdk/formfiller/cffl_iformfiller.h
+++ b/fpdfsdk/formfiller/cffl_iformfiller.h
@@ -32,7 +32,7 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify {
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags);
+ uint32_t dwFlags);
virtual void OnCreate(CPDFSDK_Annot* pAnnot);
virtual void OnLoad(CPDFSDK_Annot* pAnnot);
@@ -96,21 +96,21 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify {
CPDFSDK_PageView* pPageView,
FX_BOOL& bRC,
FX_BOOL& bExit,
- FX_DWORD nFlag);
+ uint32_t nFlag);
void OnValidate(CPDFSDK_Widget* pWidget,
CPDFSDK_PageView* pPageView,
FX_BOOL& bRC,
FX_BOOL& bExit,
- FX_DWORD nFlag);
+ uint32_t nFlag);
void OnCalculate(CPDFSDK_Widget* pWidget,
CPDFSDK_PageView* pPageView,
FX_BOOL& bExit,
- FX_DWORD nFlag);
+ uint32_t nFlag);
void OnFormat(CPDFSDK_Widget* pWidget,
CPDFSDK_PageView* pPageView,
FX_BOOL& bExit,
- FX_DWORD nFlag);
+ uint32_t nFlag);
void OnButtonUp(CPDFSDK_Widget* pWidget,
CPDFSDK_PageView* pPageView,
FX_BOOL& bReset,
@@ -156,14 +156,14 @@ class CFFL_IFormFiller : public IPWL_Filler_Notify {
FX_BOOL bKeyDown,
FX_BOOL& bRC,
FX_BOOL& bExit,
- FX_DWORD nFlag) override;
+ uint32_t nFlag) override;
#ifdef PDF_ENABLE_XFA
void OnPopupPreOpen(void* pPrivateData,
FX_BOOL& bExit,
- FX_DWORD nFlag) override;
+ uint32_t nFlag) override;
void OnPopupPostOpen(void* pPrivateData,
FX_BOOL& bExit,
- FX_DWORD nFlag) override;
+ uint32_t nFlag) override;
void SetFocusAnnotTab(CPDFSDK_Annot* pWidget,
FX_BOOL bSameField,
FX_BOOL bNext);
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 85398e3306..b668b67edb 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -25,7 +25,7 @@ CFFL_ListBox::~CFFL_ListBox() {
PWL_CREATEPARAM CFFL_ListBox::GetCreateParam() {
PWL_CREATEPARAM cp = CFFL_FormFiller::GetCreateParam();
- FX_DWORD dwFieldFlag = m_pWidget->GetFieldFlags();
+ uint32_t dwFieldFlag = m_pWidget->GetFieldFlags();
if (dwFieldFlag & FIELDFLAG_MULTISELECT) {
cp.dwFlags |= PLBS_MULTIPLESEL;
diff --git a/fpdfsdk/formfiller/cffl_pushbutton.cpp b/fpdfsdk/formfiller/cffl_pushbutton.cpp
index 7a32cbda00..001560836f 100644
--- a/fpdfsdk/formfiller/cffl_pushbutton.cpp
+++ b/fpdfsdk/formfiller/cffl_pushbutton.cpp
@@ -33,6 +33,6 @@ void CFFL_PushButton::OnDraw(CPDFSDK_PageView* pPageView,
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) {
+ uint32_t dwFlags) {
CFFL_Button::OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
}
diff --git a/fpdfsdk/formfiller/cffl_pushbutton.h b/fpdfsdk/formfiller/cffl_pushbutton.h
index 0d9d82ea0a..ff53ce45ac 100644
--- a/fpdfsdk/formfiller/cffl_pushbutton.h
+++ b/fpdfsdk/formfiller/cffl_pushbutton.h
@@ -22,7 +22,7 @@ class CFFL_PushButton : public CFFL_Button {
CPDFSDK_Annot* pAnnot,
CFX_RenderDevice* pDevice,
CFX_Matrix* pUser2Device,
- FX_DWORD dwFlags) override;
+ uint32_t dwFlags) override;
};
#endif // FPDFSDK_FORMFILLER_CFFL_PUSHBUTTON_H_