Merge to XFA - else after returns.

core/src/fpdfdoc/doc_formfield.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 FX_BOOL PDF_FormField_IsUnison(CPDF_FormField *pField)
@@ skipping 454 matching lines @@
 }
 int CPDF_FormField::GetSelectedIndex(int index)
 {
     CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
     if (pValue == NULL) {
         pValue = FPDF_GetFieldAttr(m_pDict, "I");
         if (pValue == NULL) {
             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;
         }
         if (index < 0) {
             return -1;
         }
         CPDF_Object* elementValue = ((CPDF_Array*)pValue)->GetElementValue(index);
         sel_value = elementValue ? elementValue->GetUnicodeText() : CFX_WideString();
     }
@@ skipping 674 matching lines @@
     if (m_pForm->m_pFormDict && m_pForm->m_pFormDict->GetDict("DR") &&
         m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font") )
     pFontDict = m_pForm->m_pFormDict->GetDict("DR")->GetDict("Font")->GetDict(font_name);
 
     if (pFontDict == NULL) {
         return;
     }
     m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
     m_FontSize = FX_atof(syntax.GetWord());
 }