diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:04:26 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:04:26 -0700 |
| commit | 4eb4d7f6c707cc2c23c806aa540d055c8832b55d (patch) | |
| tree | 43b7a7fac7b4ce08c287bfc03d09e5e1201e20d0 /core/src/fpdfdoc/doc_ap.cpp | |
| parent | 7cc97521db1e52d5927f5605de5f9a7102f8af40 (diff) | |
| download | pdfium-4eb4d7f6c707cc2c23c806aa540d055c8832b55d.tar.xz | |
Revert "Fix else-after-returns throughout pdfium."
This reverts commit 7cc97521db1e52d5927f5605de5f9a7102f8af40.
Diffstat (limited to 'core/src/fpdfdoc/doc_ap.cpp')
| -rw-r--r-- | core/src/fpdfdoc/doc_ap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/src/fpdfdoc/doc_ap.cpp b/core/src/fpdfdoc/doc_ap.cpp index f94a4d60e0..2d991b39c2 100644 --- a/core/src/fpdfdoc/doc_ap.cpp +++ b/core/src/fpdfdoc/doc_ap.cpp @@ -17,13 +17,13 @@ FX_BOOL FPDF_GenerateAP(CPDF_Document* pDoc, CPDF_Dictionary* pAnnotDict) FX_DWORD flags = FPDF_GetFieldAttr(pAnnotDict, "Ff")? FPDF_GetFieldAttr(pAnnotDict, "Ff")->GetInteger() : 0; if (field_type == "Tx") { return CPVT_GenerateAP::GenerateTextFieldAP(pDoc, pAnnotDict); - } - if (field_type == "Ch") { - return (flags & (1 << 17)) ? - CPVT_GenerateAP::GenerateComboBoxAP(pDoc, pAnnotDict) : - CPVT_GenerateAP::GenerateListBoxAP(pDoc, pAnnotDict); - } - if (field_type == "Btn") { + } else if (field_type == "Ch") { + if (flags & (1 << 17)) { + return CPVT_GenerateAP::GenerateComboBoxAP(pDoc, pAnnotDict); + } else { + return CPVT_GenerateAP::GenerateListBoxAP(pDoc, pAnnotDict); + } + } else if (field_type == "Btn") { if (!(flags & (1 << 16))) { if (!pAnnotDict->KeyExist("AS")) { if (CPDF_Dictionary* pParentDict = pAnnotDict->GetDict("Parent")) { |