Merge to XFA - else after returns.

core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.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/fpdfapi/fpdf_page.h"
 #include "../../../include/fpdfapi/fpdf_module.h"
 #include "../fpdf_page/pageint.h"
 #include <limits.h>
@@ skipping 503 matching lines @@
 };
 static FX_WORD FX_GetCsFromLangCode(uint32_t uCode)
 {
     int32_t iStart = 0;
     int32_t iEnd = sizeof(gs_FXLang2CharsetTable) / sizeof(FX_LANG2CS) - 1;
     while (iStart <= iEnd) {
         int32_t iMid = (iStart + iEnd) / 2;
         const FX_LANG2CS &charset = gs_FXLang2CharsetTable[iMid];
         if (uCode == charset.uLang) {
             return charset.uCharset;
-        } else if (uCode < charset.uLang) {
+        }
+        if (uCode < charset.uLang) {
             iEnd = iMid - 1;
         } else {
             iStart = iMid + 1;
         }
     };
     return 0;
 }
 static FX_WORD FX_GetCharsetFromLang(const FX_CHAR* pLang, int32_t iLength)
 {
     FXSYS_assert(pLang);
@@ skipping 637 matching lines @@
 void FPDFAPI_FlatPageAttr(CPDF_Dictionary* pPageDict, const CFX_ByteStringC& name)
 {
     if (pPageDict->KeyExist(name)) {
         return;
     }
     CPDF_Object* pObj = FPDFAPI_GetPageAttr(pPageDict, name);
     if (pObj) {
         pPageDict->SetAt(name, pObj->Clone());
     }
 }