diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:14:14 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-22 15:14:14 -0700 |
commit | 3c012fef2bb72c8ec1faa73e11ee35539b2559d6 (patch) | |
tree | b88cb30a45a615b89cdb380f1f62d270ce540fb9 /core/src/fpdfdoc/doc_formfield.cpp | |
parent | 4eb4d7f6c707cc2c23c806aa540d055c8832b55d (diff) | |
download | pdfium-3c012fef2bb72c8ec1faa73e11ee35539b2559d6.tar.xz |
Re-land else-after-returns
Revert "Revert "Fix else-after-returns throughout pdfium.""
This reverts commit 4eb4d7f6c707cc2c23c806aa540d055c8832b55d.
Fix one naming conflict.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1243953004 .
Diffstat (limited to 'core/src/fpdfdoc/doc_formfield.cpp')
-rw-r--r-- | core/src/fpdfdoc/doc_formfield.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp index d1acab8e81..087eba8aa4 100644 --- a/core/src/fpdfdoc/doc_formfield.cpp +++ b/core/src/fpdfdoc/doc_formfield.cpp @@ -472,14 +472,15 @@ int CPDF_FormField::GetSelectedIndex(int index) return -1; } } + if (pValue->GetType() == PDFOBJ_NUMBER) { + return pValue->GetInteger(); + } CFX_WideString sel_value; if (pValue->GetType() == PDFOBJ_STRING) { if (index != 0) { return -1; } sel_value = pValue->GetUnicodeText(); - } else if (pValue->GetType() == PDFOBJ_NUMBER) { - return pValue->GetInteger(); } else { if (pValue->GetType() != PDFOBJ_ARRAY) { return -1; |