Merge to XFA - else after returns.

fpdfsdk/src/fsdk_annothandler.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/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
 #include "../include/fsdk_mgr.h"
@@ skipping 291 matching lines @@
 
 FX_BOOL         CPDFSDK_AnnotHandlerMgr::Annot_OnSetFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag)
 {
     ASSERT(pAnnot != NULL);
 
     if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
     {
         if (pAnnotHandler->OnSetFocus(pAnnot, nFlag))
         {
             CPDFSDK_PageView* pPage = pAnnot->GetPageView();
-            ASSERT(pPage != NULL);
-
             pPage->GetSDKDocument();
-    //      pDocument->SetTopmostAnnot(pAnnot);
-
             return TRUE;
         }
-        else
-        {
-            return FALSE;
-        }
     }
-
     return FALSE;
 }
 
 FX_BOOL         CPDFSDK_AnnotHandlerMgr::Annot_OnKillFocus(CPDFSDK_Annot* pAnnot, FX_DWORD nFlag)
 {
-    ASSERT(pAnnot != NULL);
-
+    ASSERT(pAnnot);
     if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
-    {
-        if (pAnnotHandler->OnKillFocus(pAnnot, nFlag))
-        {
-            return TRUE;
-        }
-        else
-            return FALSE;
-    }
+        return pAnnotHandler->OnKillFocus(pAnnot, nFlag);
 
     return FALSE;
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnChangeFocus(CPDFSDK_Annot* pSetAnnot,CPDFSDK_Annot* pKillAnnot)
 {
     FX_BOOL bXFA = (pSetAnnot && pSetAnnot->GetXFAWidget()) ||
         (pKillAnnot && pKillAnnot->GetXFAWidget());
 
     if (bXFA)
     {
         if (IPDFSDK_AnnotHandler* pXFAAnnotHandler = GetAnnotHandler(FSDK_XFAWIDGET_TYPENAME))
             return pXFAAnnotHandler->OnXFAChangedFocus(pKillAnnot, pSetAnnot);
     }
 
     return TRUE;
 }
 
 CPDF_Rect   CPDFSDK_AnnotHandlerMgr::Annot_OnGetViewBBox(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot)
 {
     ASSERT(pAnnot);
     if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
-    {
         return pAnnotHandler->GetViewBBox(pPageView, pAnnot);
-    }
+
     return pAnnot->GetRect();
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnHitTest(CPDFSDK_PageView *pPageView, CPDFSDK_Annot* pAnnot, const CPDF_Point& point)
 {
     ASSERT(pAnnot);
     if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot))
     {
-        if(pAnnotHandler->CanAnswer(pAnnot))
+        if (pAnnotHandler->CanAnswer(pAnnot))
             return pAnnotHandler->HitTest(pPageView, pAnnot, point);
     }
     return FALSE;
 }
 
 CPDFSDK_Annot*  CPDFSDK_AnnotHandlerMgr::GetNextAnnot(CPDFSDK_Annot* pSDKAnnot,FX_BOOL bNext)
 {
     CPDFSDK_PageView* pPageView =  pSDKAnnot->GetPageView();
     CPDFXFA_Page* pPage = pPageView->GetPDFXFAPage();
     if (pPage == NULL)
@@ skipping 15 matching lines @@
     hNextFocus = bNext?pWidgetIterator->MoveToNext():pWidgetIterator->MoveToPrevious();
     if (hNextFocus == NULL && pSDKAnnot != NULL)
         hNextFocus = pWidgetIterator->MoveToFirst();
 
     pWidgetIterator->Release();
     return pPageView->GetAnnotByXFAWidget(hNextFocus);
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::CanAnswer(CPDFSDK_Annot* pAnnot)
 {
-    ASSERT(pAnnot);
     ASSERT(pAnnot->GetType() == "Widget");
-    CFX_ByteString sSubType = pAnnot->GetSubType();
+    if (pAnnot->GetSubType() == BFFT_SIGNATURE)
+        return FALSE;
 
-    if (sSubType == BFFT_SIGNATURE)
-    {
-    }
-    else
-    {
-        CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
-        if (!pWidget->IsVisible()) return FALSE;
+    CPDFSDK_Widget* pWidget = (CPDFSDK_Widget*)pAnnot;
+    if (!pWidget->IsVisible())
+            return FALSE;
 
-        int nFieldFlags = pWidget->GetFieldFlags();
-        if ((nFieldFlags & FIELDFLAG_READONLY) == FIELDFLAG_READONLY) return FALSE;
-        if (pWidget->GetFieldType() == FIELDTYPE_PUSHBUTTON)
-            return TRUE;
-        else
-        {
-            CPDF_Page* pPage = pWidget->GetPDFPage();
-            ASSERT(pPage != NULL);
+    int nFieldFlags = pWidget->GetFieldFlags();
+    if ((nFieldFlags & FIELDFLAG_READONLY) == FIELDFLAG_READONLY)
+        return FALSE;
 
-            CPDF_Document* pDocument = pPage->m_pDocument;
-            ASSERT(pDocument != NULL);
+    if (pWidget->GetFieldType() == FIELDTYPE_PUSHBUTTON)
+        return TRUE;
 
-            FX_DWORD dwPermissions = pDocument->GetUserPermissions();
-            return (dwPermissions&FPDFPERM_FILL_FORM) ||
-                (dwPermissions&FPDFPERM_ANNOT_FORM) ||
-            (dwPermissions&FPDFPERM_ANNOT_FORM);
-        }
-    }
-
-    return FALSE;
+    CPDF_Page* pPage = pWidget->GetPDFPage();
+    CPDF_Document* pDocument = pPage->m_pDocument;
+    FX_DWORD dwPermissions = pDocument->GetUserPermissions();
+    return (dwPermissions & FPDFPERM_FILL_FORM) ||
+            (dwPermissions & FPDFPERM_ANNOT_FORM);
 }
 
 CPDFSDK_Annot* CPDFSDK_BFAnnotHandler::NewAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPage)
 {
     CPDFSDK_Document* pSDKDoc = m_pApp->GetSDKDocument();
     CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pSDKDoc->GetInterForm();
     CPDF_FormControl* pCtrl = CPDFSDK_Widget::GetFormControl(pInterForm->GetInterForm(), pAnnot->GetAnnotDict());
     if (!pCtrl)
         return nullptr;
 
@@ skipping 879 matching lines @@
                 arrayList[j + 1] = arrayList[j];
             } while (--j >= 0 && pCompare(pTemp, (CPDFSDK_Annot*)arrayList[j]) < 0);
 
             arrayList[j+1] = pTemp;
         }
     }
 }
 
 int LyOrderCompare(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2)
 {
-    if(p1->GetLayoutOrder() < p2->GetLayoutOrder())
+    if (p1->GetLayoutOrder() < p2->GetLayoutOrder())
         return -1;
-    else if (p1->GetLayoutOrder() == p2->GetLayoutOrder())
-        return 0;
-    else
+    if (p1->GetLayoutOrder() > p2->GetLayoutOrder())
         return 1;
+    return 0;
 }
 
 FX_BOOL CPDFSDK_AnnotIterator::InitIteratorAnnotList(CPDFSDK_PageView* pPageView,CFX_PtrArray * pAnnotList)
 {
     ASSERT(pPageView);
 
     if(pAnnotList==NULL){
         pAnnotList=pPageView->GetAnnotList();
     }
 
@@ skipping 22 matching lines @@
             {
                 m_pIteratorAnnotList.RemoveAt(i);
                 m_pIteratorAnnotList.InsertAt(0, pReaderAnnot);
                 break;
             }
         }
     }
 
     return TRUE;
 }