Tidy up CPDFDOC_Environment.

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/fsdk_mgr.h"
 #include "../include/formfiller/FFL_FormFiller.h"
 #include "../include/fsdk_annothandler.h"
@@ skipping 366 matching lines @@
                         FX_DWORD dwPermissions = pDocument->GetUserPermissions();
                         return (dwPermissions&FPDFPERM_FILL_FORM) ||
                                 (dwPermissions&FPDFPERM_ANNOT_FORM) ||
                         (dwPermissions&FPDFPERM_ANNOT_FORM);
                 }
         }
 
         return FALSE;
 }
 
-CPDFSDK_Annot*          CPDFSDK_BFAnnotHandler::NewAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPage)
+CPDFSDK_Annot* CPDFSDK_BFAnnotHandler::NewAnnot(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPage)
 {
-        ASSERT(pPage != NULL);
-        pPage->GetPDFDocument();
+        CPDFSDK_Document* pSDKDoc = m_pApp->GetSDKDocument();

[Lei Zhang, 2015/07/16 17:05:06]

kill tabs

[Tom Sepez, 2015/07/16 18:01:28]

Untabified file.

+        CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pSDKDoc->GetInterForm();
+    CPDF_FormControl* pCtrl = CPDFSDK_Widget::GetFormControl(pInterForm->GetInterForm(), pAnnot->GetAnnotDict());
+    if (!pCtrl)
+        return nullptr;
 
-        CPDFSDK_Document* pSDKDoc  = m_pApp->GetCurrentDoc();
-        ASSERT(pSDKDoc);
-        CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pSDKDoc->GetInterForm();
-        ASSERT(pInterForm != NULL);
-
-        CPDFSDK_Widget* pWidget = NULL;
-        if (CPDF_FormControl* pCtrl = CPDFSDK_Widget::GetFormControl(pInterForm->GetInterForm(), pAnnot->GetAnnotDict()))
-        {
-                pWidget = new CPDFSDK_Widget(pAnnot, pPage, pInterForm);
-                pInterForm->AddMap(pCtrl, pWidget);
-                CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
-                if(pPDFInterForm && pPDFInterForm->NeedConstructAP())
-                        pWidget->ResetAppearance(NULL,FALSE);
-        }
+        CPDFSDK_Widget* pWidget = new CPDFSDK_Widget(pAnnot, pPage, pInterForm);
+    pInterForm->AddMap(pCtrl, pWidget);
+    CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
+    if (pPDFInterForm && pPDFInterForm->NeedConstructAP())
+        pWidget->ResetAppearance(NULL, FALSE);

[Lei Zhang, 2015/07/16 17:05:06]

NULL -> nullptr

[Tom Sepez, 2015/07/16 18:01:28]

Done.

 
         return pWidget;
 }
 
 void CPDFSDK_BFAnnotHandler::ReleaseAnnot(CPDFSDK_Annot* pAnnot)
 {
         ASSERT(pAnnot != NULL);
 
         if (m_pFormFiller)
                 m_pFormFiller->OnDelete(pAnnot);
@@ skipping 505 matching lines @@
                                 m_pIteratorAnnotList.RemoveAt(i);
                                 m_pIteratorAnnotList.InsertAt(0, pReaderAnnot);
                                 break;
                         }
                 }
         }
 
         return TRUE;
 }