summaryrefslogtreecommitdiff
path: root/fpdfsdk/formfiller
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/formfiller')
-rw-r--r--fpdfsdk/formfiller/cffl_combobox.cpp8
-rw-r--r--fpdfsdk/formfiller/cffl_combobox.h8
-rw-r--r--fpdfsdk/formfiller/cffl_formfiller.cpp8
-rw-r--r--fpdfsdk/formfiller/cffl_formfiller.h10
-rw-r--r--fpdfsdk/formfiller/cffl_interactiveformfiller.cpp26
-rw-r--r--fpdfsdk/formfiller/cffl_listbox.cpp2
-rw-r--r--fpdfsdk/formfiller/cffl_listbox.h2
-rw-r--r--fpdfsdk/formfiller/cffl_textfield.cpp8
-rw-r--r--fpdfsdk/formfiller/cffl_textfield.h8
9 files changed, 40 insertions, 40 deletions
diff --git a/fpdfsdk/formfiller/cffl_combobox.cpp b/fpdfsdk/formfiller/cffl_combobox.cpp
index 92dc8d621a..055b697669 100644
--- a/fpdfsdk/formfiller/cffl_combobox.cpp
+++ b/fpdfsdk/formfiller/cffl_combobox.cpp
@@ -123,7 +123,7 @@ void CFFL_ComboBox::SaveData(CPDFSDK_PageView* pPageView) {
void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- PDFSDK_FieldAction& fa) {
+ CPDFSDK_FieldAction& fa) {
switch (type) {
case CPDF_AAction::KeyStroke:
if (CPWL_ComboBox* pComboBox =
@@ -164,7 +164,7 @@ void CFFL_ComboBox::GetActionData(CPDFSDK_PageView* pPageView,
void CFFL_ComboBox::SetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& fa) {
+ const CPDFSDK_FieldAction& fa) {
switch (type) {
case CPDF_AAction::KeyStroke:
if (CPWL_ComboBox* pComboBox =
@@ -181,8 +181,8 @@ void CFFL_ComboBox::SetActionData(CPDFSDK_PageView* pPageView,
}
bool CFFL_ComboBox::IsActionDataChanged(CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& faOld,
- const PDFSDK_FieldAction& faNew) {
+ const CPDFSDK_FieldAction& faOld,
+ const CPDFSDK_FieldAction& faNew) {
switch (type) {
case CPDF_AAction::KeyStroke:
return (!faOld.bFieldFull && faOld.nSelEnd != faNew.nSelEnd) ||
diff --git a/fpdfsdk/formfiller/cffl_combobox.h b/fpdfsdk/formfiller/cffl_combobox.h
index bdc0934862..7a6390e491 100644
--- a/fpdfsdk/formfiller/cffl_combobox.h
+++ b/fpdfsdk/formfiller/cffl_combobox.h
@@ -33,13 +33,13 @@ class CFFL_ComboBox : public CFFL_TextObject,
void SaveData(CPDFSDK_PageView* pPageView) override;
void GetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- PDFSDK_FieldAction& fa) override;
+ CPDFSDK_FieldAction& fa) override;
void SetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& fa) override;
+ const CPDFSDK_FieldAction& fa) override;
bool IsActionDataChanged(CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& faOld,
- const PDFSDK_FieldAction& faNew) override;
+ const CPDFSDK_FieldAction& faOld,
+ const CPDFSDK_FieldAction& faNew) override;
void SaveState(CPDFSDK_PageView* pPageView) override;
void RestoreState(CPDFSDK_PageView* pPageView) override;
#ifdef PDF_ENABLE_XFA
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index 6ec7e266e3..dcbe0181f3 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -524,17 +524,17 @@ void CFFL_FormFiller::SetChangeMark() {
void CFFL_FormFiller::GetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- PDFSDK_FieldAction& fa) {
+ CPDFSDK_FieldAction& fa) {
fa.sValue = m_pWidget->GetValue();
}
void CFFL_FormFiller::SetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& fa) {}
+ const CPDFSDK_FieldAction& fa) {}
bool CFFL_FormFiller::IsActionDataChanged(CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& faOld,
- const PDFSDK_FieldAction& faNew) {
+ const CPDFSDK_FieldAction& faOld,
+ const CPDFSDK_FieldAction& faNew) {
return false;
}
diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h
index 11a2f8c935..0dfb0bb177 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.h
+++ b/fpdfsdk/formfiller/cffl_formfiller.h
@@ -10,9 +10,9 @@
#include <map>
#include "core/fxcrt/unowned_ptr.h"
+#include "fpdfsdk/cpdfsdk_fieldaction.h"
#include "fpdfsdk/formfiller/cba_fontmap.h"
#include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
-#include "fpdfsdk/pdfsdk_fieldaction.h"
class CPDFSDK_Annot;
class CPDFSDK_FormFillEnvironment;
@@ -90,13 +90,13 @@ class CFFL_FormFiller : public CPWL_Wnd::ProviderIface,
virtual void GetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- PDFSDK_FieldAction& fa);
+ CPDFSDK_FieldAction& fa);
virtual void SetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& fa);
+ const CPDFSDK_FieldAction& fa);
virtual bool IsActionDataChanged(CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& faOld,
- const PDFSDK_FieldAction& faNew);
+ const CPDFSDK_FieldAction& faOld,
+ const CPDFSDK_FieldAction& faNew);
virtual void SaveState(CPDFSDK_PageView* pPageView);
virtual void RestoreState(CPDFSDK_PageView* pPageView);
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index f33bde68cc..83b425725a 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -126,7 +126,7 @@ void CFFL_InteractiveFormFiller::OnMouseEnter(
pWidget->ClearAppModified();
ASSERT(pPageView);
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
pWidget->OnAAction(CPDF_AAction::CursorEnter, &fa, pPageView);
@@ -159,7 +159,7 @@ void CFFL_InteractiveFormFiller::OnMouseExit(CPDFSDK_PageView* pPageView,
pWidget->ClearAppModified();
ASSERT(pPageView);
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
pWidget->OnAAction(CPDF_AAction::CursorExit, &fa, pPageView);
@@ -195,7 +195,7 @@ bool CFFL_InteractiveFormFiller::OnLButtonDown(
pWidget->ClearAppModified();
ASSERT(pPageView);
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlags);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlags);
pWidget->OnAAction(CPDF_AAction::ButtonDown, &fa, pPageView);
@@ -273,7 +273,7 @@ bool CFFL_InteractiveFormFiller::OnButtonUp(CPDFSDK_Annot::ObservedPtr* pAnnot,
uint32_t nValueAge = pWidget->GetValueAge();
ASSERT(pPageView);
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
pWidget->OnAAction(CPDF_AAction::ButtonUp, &fa, pPageView);
@@ -385,7 +385,7 @@ bool CFFL_InteractiveFormFiller::OnSetFocus(CPDFSDK_Annot::ObservedPtr* pAnnot,
CPDFSDK_PageView* pPageView = (*pAnnot)->GetPageView();
ASSERT(pPageView);
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
pFormFiller->GetActionData(pPageView, CPDF_AAction::GetFocus, fa);
@@ -436,7 +436,7 @@ bool CFFL_InteractiveFormFiller::OnKillFocus(CPDFSDK_Annot::ObservedPtr* pAnnot,
CPDFSDK_PageView* pPageView = pWidget->GetPageView();
ASSERT(pPageView);
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
pFormFiller->GetActionData(pPageView, CPDF_AAction::LoseFocus, fa);
@@ -611,7 +611,7 @@ bool CFFL_InteractiveFormFiller::OnKeyStrokeCommit(
m_bNotifying = true;
pWidget->ClearAppModified();
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
fa.bWillCommit = true;
@@ -643,7 +643,7 @@ bool CFFL_InteractiveFormFiller::OnValidate(CPDFSDK_Annot::ObservedPtr* pAnnot,
m_bNotifying = true;
pWidget->ClearAppModified();
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
fa.bKeyDown = true;
@@ -712,7 +712,7 @@ bool CFFL_InteractiveFormFiller::OnClick(CPDFSDK_Annot::ObservedPtr* pAnnot,
uint32_t nAge = pWidget->GetAppearanceAge();
uint32_t nValueAge = pWidget->GetValueAge();
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
@@ -742,7 +742,7 @@ bool CFFL_InteractiveFormFiller::OnFull(CPDFSDK_Annot::ObservedPtr* pAnnot,
uint32_t nAge = pWidget->GetAppearanceAge();
uint32_t nValueAge = pWidget->GetValueAge();
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
@@ -795,7 +795,7 @@ bool CFFL_InteractiveFormFiller::OnPreOpen(CPDFSDK_Annot::ObservedPtr* pAnnot,
uint32_t nAge = pWidget->GetAppearanceAge();
uint32_t nValueAge = pWidget->GetValueAge();
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
@@ -826,7 +826,7 @@ bool CFFL_InteractiveFormFiller::OnPostOpen(CPDFSDK_Annot::ObservedPtr* pAnnot,
uint32_t nAge = pWidget->GetAppearanceAge();
uint32_t nValueAge = pWidget->GetValueAge();
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
@@ -884,7 +884,7 @@ std::pair<bool, bool> CFFL_InteractiveFormFiller::OnBeforeKeyStroke(
CPDFSDK_FormFillEnvironment* pFormFillEnv =
privateData.pPageView->GetFormFillEnv();
- PDFSDK_FieldAction fa;
+ CPDFSDK_FieldAction fa;
fa.bModifier = CPDFSDK_FormFillEnvironment::IsCTRLKeyDown(nFlag);
fa.bShift = CPDFSDK_FormFillEnvironment::IsSHIFTKeyDown(nFlag);
fa.sChange = strChange;
diff --git a/fpdfsdk/formfiller/cffl_listbox.cpp b/fpdfsdk/formfiller/cffl_listbox.cpp
index 41e4774218..943412d509 100644
--- a/fpdfsdk/formfiller/cffl_listbox.cpp
+++ b/fpdfsdk/formfiller/cffl_listbox.cpp
@@ -134,7 +134,7 @@ void CFFL_ListBox::SaveData(CPDFSDK_PageView* pPageView) {
void CFFL_ListBox::GetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- PDFSDK_FieldAction& fa) {
+ CPDFSDK_FieldAction& fa) {
switch (type) {
case CPDF_AAction::Validate:
if (m_pWidget->GetFieldFlags() & FIELDFLAG_MULTISELECT) {
diff --git a/fpdfsdk/formfiller/cffl_listbox.h b/fpdfsdk/formfiller/cffl_listbox.h
index 014865d567..9db3c5da1d 100644
--- a/fpdfsdk/formfiller/cffl_listbox.h
+++ b/fpdfsdk/formfiller/cffl_listbox.h
@@ -27,7 +27,7 @@ class CFFL_ListBox : public CFFL_TextObject {
void SaveData(CPDFSDK_PageView* pPageView) override;
void GetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- PDFSDK_FieldAction& fa) override;
+ CPDFSDK_FieldAction& fa) override;
void SaveState(CPDFSDK_PageView* pPageView) override;
void RestoreState(CPDFSDK_PageView* pPageView) override;
diff --git a/fpdfsdk/formfiller/cffl_textfield.cpp b/fpdfsdk/formfiller/cffl_textfield.cpp
index 6d7277c8fa..eeed266235 100644
--- a/fpdfsdk/formfiller/cffl_textfield.cpp
+++ b/fpdfsdk/formfiller/cffl_textfield.cpp
@@ -156,7 +156,7 @@ void CFFL_TextField::SaveData(CPDFSDK_PageView* pPageView) {
void CFFL_TextField::GetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- PDFSDK_FieldAction& fa) {
+ CPDFSDK_FieldAction& fa) {
switch (type) {
case CPDF_AAction::KeyStroke:
if (CPWL_Edit* pWnd = GetEdit(pPageView, false)) {
@@ -186,7 +186,7 @@ void CFFL_TextField::GetActionData(CPDFSDK_PageView* pPageView,
void CFFL_TextField::SetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& fa) {
+ const CPDFSDK_FieldAction& fa) {
switch (type) {
case CPDF_AAction::KeyStroke:
if (CPWL_Edit* pEdit = GetEdit(pPageView, false)) {
@@ -201,8 +201,8 @@ void CFFL_TextField::SetActionData(CPDFSDK_PageView* pPageView,
}
bool CFFL_TextField::IsActionDataChanged(CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& faOld,
- const PDFSDK_FieldAction& faNew) {
+ const CPDFSDK_FieldAction& faOld,
+ const CPDFSDK_FieldAction& faNew) {
switch (type) {
case CPDF_AAction::KeyStroke:
return (!faOld.bFieldFull && faOld.nSelEnd != faNew.nSelEnd) ||
diff --git a/fpdfsdk/formfiller/cffl_textfield.h b/fpdfsdk/formfiller/cffl_textfield.h
index 49ffc0fc33..4d34d055a5 100644
--- a/fpdfsdk/formfiller/cffl_textfield.h
+++ b/fpdfsdk/formfiller/cffl_textfield.h
@@ -38,13 +38,13 @@ class CFFL_TextField : public CFFL_TextObject,
void SaveData(CPDFSDK_PageView* pPageView) override;
void GetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- PDFSDK_FieldAction& fa) override;
+ CPDFSDK_FieldAction& fa) override;
void SetActionData(CPDFSDK_PageView* pPageView,
CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& fa) override;
+ const CPDFSDK_FieldAction& fa) override;
bool IsActionDataChanged(CPDF_AAction::AActionType type,
- const PDFSDK_FieldAction& faOld,
- const PDFSDK_FieldAction& faNew) override;
+ const CPDFSDK_FieldAction& faOld,
+ const CPDFSDK_FieldAction& faNew) override;
void SaveState(CPDFSDK_PageView* pPageView) override;
void RestoreState(CPDFSDK_PageView* pPageView) override;
#ifdef PDF_ENABLE_XFA
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 14:10:43 +0000