diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 14:59:55 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 14:59:55 -0700 |
| commit | 7cc97521db1e52d5927f5605de5f9a7102f8af40 (patch) | |
| tree | df96cf98cd470e794c7817f347511f3c554c96e4 /core/src/fpdfdoc/doc_ap.cpp | |
| parent | b05f1fd710496dea44b001bb905fa1c16a39bb28 (diff) | |
| download | pdfium-7cc97521db1e52d5927f5605de5f9a7102f8af40.tar.xz | |
Fix else-after-returns throughout pdfium.
Driven by CS search for
pcre:yes file:third_party/pdfium/ -file:pdfium/third_party/
\breturn\b[^;]*;\s*\n*\s*\}*\s*\n*\r*else
Note: Care is required to ensure the preceding block is not an else-if.
As usual, removed any tabs I saw.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1243883003 .
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 2d991b39c2..f94a4d60e0 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); - } 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 (field_type == "Ch") { + return (flags & (1 << 17)) ? + CPVT_GenerateAP::GenerateComboBoxAP(pDoc, pAnnotDict) : + CPVT_GenerateAP::GenerateListBoxAP(pDoc, pAnnotDict); + } + if (field_type == "Btn") { if (!(flags & (1 << 16))) { if (!pAnnotDict->KeyExist("AS")) { if (CPDF_Dictionary* pParentDict = pAnnotDict->GetDict("Parent")) { |