Fix else-after-returns throughout pdfium.

fpdfsdk/src/formfiller/FFL_IFormFiller.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/FFL_FormFiller.h"
 #include "../../include/formfiller/FFL_IFormFiller.h"
 #include "../../include/formfiller/FFL_CheckBox.h"
 #include "../../include/formfiller/FFL_ComboBox.h"
@@ skipping 26 matching lines @@
 {
         CPDF_Rect rc = pAnnot->GetRect();
         if(rc.Contains(point.x, point.y))
                 return TRUE;
         return FALSE;
 }
 
 FX_RECT CFFL_IFormFiller::GetViewBBox(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot)
 {
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
-        {
                 return pFormFiller->GetViewBBox(pPageView, pAnnot);
-        }
-        else
-        {
-                ASSERT(pPageView != NULL);
-                ASSERT(pAnnot != NULL);
 
-                CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
-                ASSERT(pPDFAnnot != NULL);
+    ASSERT(pPageView != NULL);
 
-                CPDF_Rect rcAnnot;
-                pPDFAnnot->GetRect(rcAnnot);
+    CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
+    CPDF_Rect rcAnnot;
+    pPDFAnnot->GetRect(rcAnnot);
 
-//              CRect rcWin;
-//              pPageView->DocToWindow(rcAnnot, rcWin);
-                CPDF_Rect rcWin = CPWL_Utils::InflateRect(rcAnnot,1);
-//              rcWin.InflateRect(1, 1);
-
-                return rcWin.GetOutterRect();
-        }
+    CPDF_Rect rcWin = CPWL_Utils::InflateRect(rcAnnot, 1);
+    return rcWin.GetOutterRect();
 }
 
 void CFFL_IFormFiller::OnDraw(CPDFSDK_PageView* pPageView, /*HDC hDC,*/ CPDFSDK_Annot* pAnnot,
                                                 CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
                                                 /*const CRect& rcWindow,*/ FX_DWORD dwFlags)
 {
         ASSERT(pPageView != NULL);
         CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
 
         if (IsVisible(pWidget))
@@ skipping 354 matching lines @@
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
         {
                 return pFormFiller->OnKeyDown(pAnnot, nKeyCode, nFlags);
         }
 
         return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags)
 {
-        ASSERT(pAnnot != NULL);
         ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
-
-        if (nChar == FWL_VKEY_Tab) return TRUE;
+        if (nChar == FWL_VKEY_Tab)
+        return TRUE;
 
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
-        {
                 return pFormFiller->OnChar(pAnnot, nChar, nFlags);
-        }
 
         return FALSE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnSetFocus(CPDFSDK_Annot* pAnnot,FX_UINT nFlag)
 {
-        if(!pAnnot) return FALSE;
+        if (!pAnnot)
+        return FALSE;
+
         ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
         if (!m_bNotifying)
         {
                 CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
                 if (pWidget->GetAAction(CPDF_AAction::GetFocus))
                 {
                         m_bNotifying = TRUE;
                         pWidget->GetAppearanceAge();
+
                         int nValueAge = pWidget->GetValueAge();
                         pWidget->ClearAppModified();
 
-
                         CPDFSDK_PageView* pPageView = pAnnot->GetPageView();
                         ASSERT(pPageView != NULL);
 
                         PDFSDK_FieldAction fa;
                         fa.bModifier = m_pApp->FFI_IsCTRLKeyDown(nFlag);
                         fa.bShift = m_pApp->FFI_IsSHIFTKeyDown(nFlag);
 
-
                         CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, TRUE);
                         if(!pFormFiller) return FALSE;
                         pFormFiller->GetActionData(pPageView, CPDF_AAction::GetFocus, fa);
-
                         pWidget->OnAAction(CPDF_AAction::GetFocus, fa, pPageView);
                         m_bNotifying = FALSE;
 
- //                     if (!IsValidAnnot(m_pApp, pDocument, pDocView, pPageView, pAnnot)) return FALSE;
-
                         if (pWidget->IsAppModified())
                         {
                                 if (CFFL_FormFiller* pFormFiller = GetFormFiller(pWidget, FALSE))
                                 {
                                         pFormFiller->ResetPDFWindow(pPageView, nValueAge == pWidget->GetValueAge());
                                 }
                         }
                 }
         }
 
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, TRUE))
-        {
-                if (pFormFiller->OnSetFocus(pAnnot, nFlag))
-                {
-                        return TRUE;
-                }
-                else
-                        return FALSE;
-        }
+                return pFormFiller->OnSetFocus(pAnnot, nFlag);
 
         return TRUE;
 }
 
 FX_BOOL CFFL_IFormFiller::OnKillFocus(CPDFSDK_Annot* pAnnot,FX_UINT nFlag)
 {
         if(!pAnnot) return FALSE;
         ASSERT(pAnnot->GetPDFAnnot()->GetSubType() == "Widget");
 
         if (CFFL_FormFiller* pFormFiller = GetFormFiller(pAnnot, FALSE))
@@ skipping 450 matching lines @@
         ASSERT(pPrivateData != NULL);
         CFFL_PrivateData* pData = (CFFL_PrivateData*)pPrivateData;
         ASSERT(pData->pWidget != NULL);
 
         CFFL_FormFiller* pFormFiller = GetFormFiller(pData->pWidget, FALSE);
         ASSERT(pFormFiller != NULL);
 
         if (!bEditOrList)
                 pFormFiller->OnKeyStroke(bExit);
 }