summaryrefslogtreecommitdiff
path: root/core/fpdfdoc/cpdf_formfield.cpp
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-01-23 15:48:51 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-01-24 15:30:36 +0000
commita478dc5ca23b6f2f609b119cdc6b0336d1471d8c (patch)
treec57caac5f6341d4c340a6cf18802168b07e09eb1 /core/fpdfdoc/cpdf_formfield.cpp
parent7e5fdd0b1a2ce17e89723fee3e58ae472e32461f (diff)
downloadpdfium-a478dc5ca23b6f2f609b119cdc6b0336d1471d8c.tar.xz
Fix CPDF_InterForm::CheckRequiredFields and its callers.
The method is used twice in fpdfsdk/cpdfsdk_interform.cpp and twice in fpdfsdk/javascript/Document.cpp, but not in a compatible way. Changed the method so that it now returns true when checks pass, which is the more natural thing to do, considering the name of the method. BUG=pdfium:659 Change-Id: Iacf3049f328df1d4db3fbfc995acf184230ebf48 Reviewed-on: https://pdfium-review.googlesource.com/2297 Commit-Queue: Nicolás Peña <npm@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfdoc/cpdf_formfield.cpp')
-rw-r--r--core/fpdfdoc/cpdf_formfield.cpp16
1 files changed, 6 insertions, 10 deletions
diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp
index b344327adc..b4aa90e2be 100644
--- a/core/fpdfdoc/cpdf_formfield.cpp
+++ b/core/fpdfdoc/cpdf_formfield.cpp
@@ -31,10 +31,6 @@ const int kFormListMultiSelect = 0x100;
const int kFormComboEdit = 0x100;
-const int kFormFieldReadOnly = 0x01;
-const int kFormFieldRequired = 0x02;
-const int kFormFieldNoExport = 0x04;
-
const int kFormRadioNoToggleOff = 0x100;
const int kFormRadioUnison = 0x200;
@@ -108,12 +104,12 @@ void CPDF_FormField::SyncFieldFlags() {
? FPDF_GetFieldAttr(m_pDict, "Ff")->GetInteger()
: 0;
m_Flags = 0;
- if (flags & 1)
- m_Flags |= kFormFieldReadOnly;
- if (flags & 2)
- m_Flags |= kFormFieldRequired;
- if (flags & 4)
- m_Flags |= kFormFieldNoExport;
+ if (flags & FORMFLAG_READONLY)
+ m_Flags |= FORMFLAG_READONLY;
+ if (flags & FORMFLAG_REQUIRED)
+ m_Flags |= FORMFLAG_REQUIRED;
+ if (flags & FORMFLAG_NOEXPORT)
+ m_Flags |= FORMFLAG_NOEXPORT;
if (type_name == "Btn") {
if (flags & 0x8000) {