Fix else-after-returns throughout pdfium.

fpdfsdk/src/formfiller/FFL_ComboBox.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/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_IFormFiller.h"
 #include "../../include/formfiller/FFL_CBA_Fontmap.h"
@@ skipping 67 matching lines @@
 }
 
 
 FX_BOOL CFFL_ComboBox::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags)
 {
         return CFFL_FormFiller::OnChar(pAnnot, nChar, nFlags);
 }
 
 FX_BOOL CFFL_ComboBox::IsDataChanged(CPDFSDK_PageView* pPageView)
 {
-        if (CPWL_ComboBox * pWnd = (CPWL_ComboBox*)GetPDFWindow(pPageView, FALSE))
-        {
-                int32_t nCurSel = pWnd->GetSelect();
+    CPWL_ComboBox* pWnd = (CPWL_ComboBox*)GetPDFWindow(pPageView, FALSE);
+        if (!pWnd)
+        return FALSE;
 
-                ASSERT(m_pWidget != NULL);
+    int32_t nCurSel = pWnd->GetSelect();
+        if (!(m_pWidget->GetFieldFlags() & FIELDFLAG_EDIT))
+        return nCurSel != m_pWidget->GetSelectedIndex(0);
 
-                if (m_pWidget->GetFieldFlags() & FIELDFLAG_EDIT)
-                {
-                        if (nCurSel >= 0)
-                        {
-                                return nCurSel != m_pWidget->GetSelectedIndex(0);
-                        }
-                        else
-                        {
-                                return pWnd->GetText() != m_pWidget->GetValue();
-                        }
-                }
-                else
-                {
-                        return nCurSel != m_pWidget->GetSelectedIndex(0);
-                }
-        }
+    if (nCurSel >= 0)
+        return nCurSel != m_pWidget->GetSelectedIndex(0);
 
-        return FALSE;
+    return pWnd->GetText() != m_pWidget->GetValue();
 }
 
 void CFFL_ComboBox::SaveData(CPDFSDK_PageView* pPageView)
 {
         ASSERT(m_pWidget != NULL);
 
         if (CPWL_ComboBox* pWnd = (CPWL_ComboBox*)GetPDFWindow(pPageView, FALSE))
         {
                 CFX_WideString swText = pWnd->GetText();
                 int32_t nCurSel = pWnd->GetSelect();
@@ skipping 271 matching lines @@
                 if (CPDF_FormField * pFormField = m_pWidget->GetFormField())
                 {
                         swRet = pFormField->GetOptionValue(nExport);
                         if (swRet.IsEmpty())
                                 swRet = pFormField->GetOptionLabel(nExport);
                 }
         }
 
         return swRet;
 }