diff options
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/cpdfsdk_interform.cpp | 24 | ||||
| -rw-r--r-- | fpdfsdk/cpdfsdk_interform.h | 8 |
2 files changed, 14 insertions, 18 deletions
diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp index 94c9b23473..57f3a6e90e 100644 --- a/fpdfsdk/cpdfsdk_interform.cpp +++ b/fpdfsdk/cpdfsdk_interform.cpp @@ -622,16 +622,14 @@ std::vector<CPDF_FormField*> CPDFSDK_InterForm::GetFieldFromObjects( return fields; } -int CPDFSDK_InterForm::BeforeValueChange(CPDF_FormField* pField, - const WideString& csValue) { +bool CPDFSDK_InterForm::BeforeValueChange(CPDF_FormField* pField, + const WideString& csValue) { FormFieldType fieldType = pField->GetFieldType(); if (!IsFormFieldTypeComboOrText(fieldType)) - return 0; + return true; if (!OnKeyStrokeCommit(pField, csValue)) - return -1; - if (!OnValidate(pField, csValue)) - return -1; - return 1; + return false; + return OnValidate(pField, csValue); } void CPDFSDK_InterForm::AfterValueChange(CPDF_FormField* pField) { @@ -650,15 +648,13 @@ void CPDFSDK_InterForm::AfterValueChange(CPDF_FormField* pField) { UpdateField(pField); } -int CPDFSDK_InterForm::BeforeSelectionChange(CPDF_FormField* pField, - const WideString& csValue) { +bool CPDFSDK_InterForm::BeforeSelectionChange(CPDF_FormField* pField, + const WideString& csValue) { if (pField->GetFieldType() != FormFieldType::kListBox) - return 0; + return true; if (!OnKeyStrokeCommit(pField, csValue)) - return -1; - if (!OnValidate(pField, csValue)) - return -1; - return 1; + return false; + return OnValidate(pField, csValue); } void CPDFSDK_InterForm::AfterSelectionChange(CPDF_FormField* pField) { diff --git a/fpdfsdk/cpdfsdk_interform.h b/fpdfsdk/cpdfsdk_interform.h index 893b60168b..58dc2d0993 100644 --- a/fpdfsdk/cpdfsdk_interform.h +++ b/fpdfsdk/cpdfsdk_interform.h @@ -102,11 +102,11 @@ class CPDFSDK_InterForm : public IPDF_FormNotify { private: // IPDF_FormNotify: - int BeforeValueChange(CPDF_FormField* pField, - const WideString& csValue) override; + bool BeforeValueChange(CPDF_FormField* pField, + const WideString& csValue) override; void AfterValueChange(CPDF_FormField* pField) override; - int BeforeSelectionChange(CPDF_FormField* pField, - const WideString& csValue) override; + bool BeforeSelectionChange(CPDF_FormField* pField, + const WideString& csValue) override; void AfterSelectionChange(CPDF_FormField* pField) override; void AfterCheckedStatusChange(CPDF_FormField* pField) override; void AfterFormReset(CPDF_InterForm* pForm) override; |