diff options
author | dan sinclair <dsinclair@chromium.org> | 2018-03-08 15:14:09 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-03-08 15:14:09 +0000 |
commit | 507fb4ed09d5fbc92fafdfe405d79d44d11a4664 (patch) | |
tree | 136d003fdefa3ad7fd707af180c161713108ffd2 /fpdfsdk/cpdfsdk_interform.cpp | |
parent | f19255a1deec5f3ce804b08901abf7746e609bfe (diff) | |
download | pdfium-507fb4ed09d5fbc92fafdfe405d79d44d11a4664.tar.xz |
Convert Before{Selection|Value}Change to return a boolchromium/3366
Both of these IPDF_FormNotify methods return {-1, 0, 1} but all
callsites only care about < 0 and >= 0. Convert to return a bool that
treats the 0 and 1 case as the same.
This also makse sense in terms of the API because false means validation
failure. The case where 0 was used was a place holder for we didn't try
for this field type, which also implicitly means validation passed.
Change-Id: I0950c678191b83caffd755d4a87b2f0efee71c89
Reviewed-on: https://pdfium-review.googlesource.com/28192
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'fpdfsdk/cpdfsdk_interform.cpp')
-rw-r--r-- | fpdfsdk/cpdfsdk_interform.cpp | 24 |
1 files changed, 10 insertions, 14 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) { |