Merge to XFA: Cleanup after syncing CPDFSDK_BAAnnot

fpdfsdk/src/fsdk_baseannot.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/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
 
-//---------------------------------------------------------------------------
-//                              CPDFSDK_DateTime
-//---------------------------------------------------------------------------
 int _gAfxGetTimeZoneInSeconds(FX_CHAR tzhour, uint8_t tzminute) {
   return (int)tzhour * 3600 + (int)tzminute * (tzhour >= 0 ? 60 : -60);
 }
 
 FX_BOOL _gAfxIsLeapYear(int16_t year) {
   return ((year % 400 == 0) || ((year % 4 == 0) && (year % 100 != 0)));
 }
 
 FX_WORD _gAfxGetYearDays(int16_t year) {
   return (_gAfxIsLeapYear(year) == TRUE ? 366 : 365);
@@ skipping 471 matching lines @@
   dt.hour %= 24;
   n %= 3600;
   dt.minute = (uint8_t)(n / 60);
   dt.second = (uint8_t)(n % 60);
   if (days != 0)
     AddDays(days);
 
   return *this;
 }
 
-//---------------------------------------------------------------------------
-//                              CPDFSDK_Annot
-//---------------------------------------------------------------------------
 CPDFSDK_Annot::CPDFSDK_Annot(CPDFSDK_PageView* pPageView)
-    : m_pPageView(pPageView), m_bSelected(FALSE), m_nTabOrder(-1) {}
+    : m_pPageView(pPageView), m_bSelected(FALSE), m_nTabOrder(-1) {
+}
 
-// CPDFSDK_BAAnnot
 CPDFSDK_BAAnnot::CPDFSDK_BAAnnot(CPDF_Annot* pAnnot,
                                  CPDFSDK_PageView* pPageView)
-    : CPDFSDK_Annot(pPageView), m_pAnnot(pAnnot) {}
-
-CPDFSDK_BAAnnot::~CPDFSDK_BAAnnot() {
-  m_pAnnot = NULL;
+    : CPDFSDK_Annot(pPageView), m_pAnnot(pAnnot) {
 }
 
 CPDF_Annot* CPDFSDK_BAAnnot::GetPDFAnnot() const {
   return m_pAnnot;
 }
 
 FX_BOOL CPDFSDK_Annot::IsSelected() {
   return m_bSelected;
 }
 
@@ skipping 331 matching lines @@
                                       const CPDF_Matrix& matrix,
                                       const CFX_ByteString& sContents,
                                       const CFX_ByteString& sAPState) {
   CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDict("AP");
 
   if (!pAPDict) {
     pAPDict = new CPDF_Dictionary;
     m_pAnnot->GetAnnotDict()->SetAt("AP", pAPDict);
   }
 
-  CPDF_Stream* pStream = NULL;
-  CPDF_Dictionary* pParentDict = NULL;
+  CPDF_Stream* pStream = nullptr;
+  CPDF_Dictionary* pParentDict = nullptr;
 
   if (sAPState.IsEmpty()) {
     pParentDict = pAPDict;
     pStream = pAPDict->GetStream(sAPType);
   } else {
     CPDF_Dictionary* pAPTypeDict = pAPDict->GetDict(sAPType);
     if (!pAPTypeDict) {
       pAPTypeDict = new CPDF_Dictionary;
       pAPDict->SetAt(sAPType, pAPTypeDict);
     }
 
     pParentDict = pAPTypeDict;
     pStream = pAPTypeDict->GetStream(sAPState);
   }
 
   if (!pStream) {
-    ASSERT(m_pPageView != NULL);
+    pStream = new CPDF_Stream(nullptr, 0, nullptr);
+
     CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
-    ASSERT(pDoc != NULL);
-
-    pStream = new CPDF_Stream(NULL, 0, NULL);
     int32_t objnum = pDoc->AddIndirectObject(pStream);
     // pAPDict->SetAtReference(sAPType, pDoc, objnum);
     ASSERT(pParentDict != NULL);
     pParentDict->SetAtReference(sAPType, pDoc, objnum);
   }
 
   CPDF_Dictionary* pStreamDict = pStream->GetDict();
-
   if (!pStreamDict) {
     pStreamDict = new CPDF_Dictionary;
     pStreamDict->SetAtName("Type", "XObject");
     pStreamDict->SetAtName("Subtype", "Form");
     pStreamDict->SetAtInteger("FormType", 1);
-    pStream->InitStream(NULL, 0, pStreamDict);
+    pStream->InitStream(nullptr, 0, pStreamDict);
   }
 
   if (pStreamDict) {
     pStreamDict->SetAtMatrix("Matrix", matrix);
     pStreamDict->SetAtRect("BBox", rcBBox);
   }
 
   pStream->SetData((uint8_t*)sContents.c_str(), sContents.GetLength(), FALSE,
                    FALSE);
 }
@@ skipping 84 matching lines @@
   if (m_pPageView)
     return m_pPageView->GetPDFPage();
   return NULL;
 }
 
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage() {
   if (m_pPageView)
     return m_pPageView->GetPDFXFAPage();
   return NULL;
 }