summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/fpdfdoc/cpdf_interform.cpp6
-rw-r--r--core/fpdfdoc/ipdf_formnotify.h4
-rw-r--r--fpdfsdk/cpdfsdk_interform.cpp8
-rw-r--r--fpdfsdk/cpdfsdk_interform.h2
4 files changed, 2 insertions, 18 deletions
diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp
index 1596b17d82..c8440eac00 100644
--- a/core/fpdfdoc/cpdf_interform.cpp
+++ b/core/fpdfdoc/cpdf_interform.cpp
@@ -901,9 +901,6 @@ int CPDF_InterForm::GetFormAlignment() const {
bool CPDF_InterForm::ResetForm(const std::vector<CPDF_FormField*>& fields,
bool bIncludeOrExclude,
bool bNotify) {
- if (bNotify && m_pFormNotify && m_pFormNotify->BeforeFormReset(this) < 0)
- return false;
-
size_t nCount = m_pFieldTree->m_Root.CountFields();
for (size_t i = 0; i < nCount; ++i) {
CPDF_FormField* pField = m_pFieldTree->m_Root.GetFieldAtIndex(i);
@@ -919,9 +916,6 @@ bool CPDF_InterForm::ResetForm(const std::vector<CPDF_FormField*>& fields,
}
bool CPDF_InterForm::ResetForm(bool bNotify) {
- if (bNotify && m_pFormNotify && m_pFormNotify->BeforeFormReset(this) < 0)
- return false;
-
size_t nCount = m_pFieldTree->m_Root.CountFields();
for (size_t i = 0; i < nCount; ++i) {
CPDF_FormField* pField = m_pFieldTree->m_Root.GetFieldAtIndex(i);
diff --git a/core/fpdfdoc/ipdf_formnotify.h b/core/fpdfdoc/ipdf_formnotify.h
index 301139b433..10a97a0d88 100644
--- a/core/fpdfdoc/ipdf_formnotify.h
+++ b/core/fpdfdoc/ipdf_formnotify.h
@@ -19,13 +19,13 @@ class IPDF_FormNotify {
virtual int BeforeValueChange(CPDF_FormField* pField,
const WideString& csValue) = 0;
virtual void AfterValueChange(CPDF_FormField* pField) = 0;
+
virtual int BeforeSelectionChange(CPDF_FormField* pField,
const WideString& csValue) = 0;
virtual void AfterSelectionChange(CPDF_FormField* pField) = 0;
+
virtual void AfterCheckedStatusChange(CPDF_FormField* pField) = 0;
- virtual int BeforeFormReset(CPDF_InterForm* pForm) = 0;
virtual void AfterFormReset(CPDF_InterForm* pForm) = 0;
- virtual int BeforeFormImportData(CPDF_InterForm* pForm) = 0;
};
#endif // CORE_FPDFDOC_IPDF_FORMNOTIFY_H_
diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp
index 9e4c5f4f97..94c9b23473 100644
--- a/fpdfsdk/cpdfsdk_interform.cpp
+++ b/fpdfsdk/cpdfsdk_interform.cpp
@@ -680,18 +680,10 @@ void CPDFSDK_InterForm::AfterCheckedStatusChange(CPDF_FormField* pField) {
UpdateField(pField);
}
-int CPDFSDK_InterForm::BeforeFormReset(CPDF_InterForm* pForm) {
- return 0;
-}
-
void CPDFSDK_InterForm::AfterFormReset(CPDF_InterForm* pForm) {
OnCalculate(nullptr);
}
-int CPDFSDK_InterForm::BeforeFormImportData(CPDF_InterForm* pForm) {
- return 0;
-}
-
bool CPDFSDK_InterForm::IsNeedHighLight(FormFieldType fieldType) {
if (fieldType == FormFieldType::kUnknown)
return false;
diff --git a/fpdfsdk/cpdfsdk_interform.h b/fpdfsdk/cpdfsdk_interform.h
index 7e2ae04b13..893b60168b 100644
--- a/fpdfsdk/cpdfsdk_interform.h
+++ b/fpdfsdk/cpdfsdk_interform.h
@@ -109,9 +109,7 @@ class CPDFSDK_InterForm : public IPDF_FormNotify {
const WideString& csValue) override;
void AfterSelectionChange(CPDF_FormField* pField) override;
void AfterCheckedStatusChange(CPDF_FormField* pField) override;
- int BeforeFormReset(CPDF_InterForm* pForm) override;
void AfterFormReset(CPDF_InterForm* pForm) override;
- int BeforeFormImportData(CPDF_InterForm* pForm) override;
bool FDFToURLEncodedData(uint8_t*& pBuf, size_t& nBufSize);
int GetPageIndexByAnnotDict(CPDF_Document* pDocument,