summaryrefslogtreecommitdiff
path: root/fpdfsdk/formfiller
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/formfiller')
-rw-r--r--fpdfsdk/formfiller/cffl_formfiller.cpp10
-rw-r--r--fpdfsdk/formfiller/cffl_interactiveformfiller.cpp35
-rw-r--r--fpdfsdk/formfiller/cffl_interactiveformfiller.h4
3 files changed, 23 insertions, 26 deletions
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index e59cd0520f..fd569c7201 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -361,8 +361,8 @@ CPWL_Wnd* CFFL_FormFiller::GetPDFWindow(CPDFSDK_PageView* pPageView,
auto* pPrivateData = new CFFL_PrivateData;
pPrivateData->pWidget = m_pWidget.Get();
pPrivateData->pPageView = pPageView;
- pPrivateData->nWidgetAge = m_pWidget->GetAppearanceAge();
- pPrivateData->nValueAge = 0;
+ pPrivateData->nWidgetAppearanceAge = m_pWidget->GetAppearanceAge();
+ pPrivateData->nWidgetValueAge = 0;
cp.pAttachedData = pPrivateData;
CPWL_Wnd* pNewWnd = NewPDFWindow(cp);
m_Maps[pPageView] = pNewWnd;
@@ -370,11 +370,11 @@ CPWL_Wnd* CFFL_FormFiller::GetPDFWindow(CPDFSDK_PageView* pPageView,
}
auto* pPrivateData = static_cast<CFFL_PrivateData*>(pWnd->GetAttachedData());
- if (pPrivateData->nWidgetAge == m_pWidget->GetAppearanceAge())
+ if (pPrivateData->nWidgetAppearanceAge == m_pWidget->GetAppearanceAge())
return pWnd;
- return ResetPDFWindow(pPageView,
- m_pWidget->GetValueAge() == pPrivateData->nValueAge);
+ return ResetPDFWindow(
+ pPageView, pPrivateData->nWidgetValueAge == m_pWidget->GetValueAge());
}
void CFFL_FormFiller::DestroyPDFWindow(CPDFSDK_PageView* pPageView) {
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index 425c2add35..989539fad3 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -122,7 +122,7 @@ void CFFL_InteractiveFormFiller::OnMouseEnter(
if (pWidget->GetAAction(CPDF_AAction::CursorEnter).GetDict()) {
m_bNotifying = true;
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
pWidget->ClearAppModified();
ASSERT(pPageView);
@@ -154,9 +154,8 @@ void CFFL_InteractiveFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView,
CPDFSDK_Widget* pWidget = static_cast<CPDFSDK_Widget*>(pAnnot->Get());
if (pWidget->GetAAction(CPDF_AAction::CursorExit).GetDict()) {
m_bNotifying = true;
- pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
pWidget->ClearAppModified();
ASSERT(pPageView);
@@ -191,9 +190,8 @@ bool CFFL_InteractiveFormFiller::OnLButtonDown(
if (Annot_HitTest(pPageView, pAnnot->Get(), point) &&
pWidget->GetAAction(CPDF_AAction::ButtonDown).GetDict()) {
m_bNotifying = true;
- pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
pWidget->ClearAppModified();
ASSERT(pPageView);
@@ -271,8 +269,8 @@ bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot,
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
ASSERT(pPageView);
PDFSDK_FieldAction fa;
@@ -376,9 +374,8 @@ bool CFFL_InteractiveFormFiller::OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot,
CPDFSDK_Widget* pWidget = static_cast<CPDFSDK_Widget*>(pAnnot->Get());
if (pWidget->GetAAction(CPDF_AAction::GetFocus).GetDict()) {
m_bNotifying = true;
- pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
pWidget->ClearAppModified();
CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, true);
@@ -718,8 +715,8 @@ bool CFFL_InteractiveFormFiller::OnClick(CPDFSDK_Annot::ObservedPtr* pAnnot,
return false;
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
PDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
@@ -748,8 +745,8 @@ bool CFFL_InteractiveFormFiller::OnFull(CPDFSDK_Annot::ObservedPtr* pAnnot,
return false;
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
PDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
@@ -801,8 +798,8 @@ bool CFFL_InteractiveFormFiller::OnPreOpen(CPDFSDK_Annot::ObservedPtr* pAnnot,
return false;
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
PDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
@@ -832,8 +829,8 @@ bool CFFL_InteractiveFormFiller::OnPostOpen(CPDFSDK_Annot::ObservedPtr* pAnnot,
return false;
m_bNotifying = true;
- int nAge = pWidget->GetAppearanceAge();
- int nValueAge = pWidget->GetValueAge();
+ uint32_t nAge = pWidget->GetAppearanceAge();
+ uint32_t nValueAge = pWidget->GetValueAge();
PDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
@@ -888,8 +885,8 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke(
CFX_AutoRestorer<bool> restorer(&m_bNotifying);
m_bNotifying = true;
- int nAge = privateData.pWidget->GetAppearanceAge();
- int nValueAge = privateData.pWidget->GetValueAge();
+ uint32_t nAge = privateData.pWidget->GetAppearanceAge();
+ uint32_t nValueAge = privateData.pWidget->GetValueAge();
CPDFSDK_FormFillEnvironment* pFormFillEnv =
privateData.pPageView->GetFormFillEnv();
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.h b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
index ddab2adcda..0982f1d92b 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.h
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.h
@@ -157,8 +157,8 @@ class CFFL_PrivateData : public CPWL_Wnd::PrivateData {
public:
CPDFSDK_Widget* pWidget;
CPDFSDK_PageView* pPageView;
- int nWidgetAge;
- int nValueAge;
+ uint32_t nWidgetAppearanceAge;
+ uint32_t nWidgetValueAge;
};
#endif // FPDFSDK_FORMFILLER_CFFL_INTERACTIVEFORMFILLER_H_
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 05:31:56 +0000