Merge to XFA: Cleanup after syncing CPDFSDK_BAAnnot

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 <algorithm>
 
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
@@ skipping 119 matching lines @@
     const CFX_ByteString& sType) const {
   auto it = m_mapType2Handler.find(sType);
   return it != m_mapType2Handler.end() ? it->second : nullptr;
 }
 
 void CPDFSDK_AnnotHandlerMgr::Annot_OnDraw(CPDFSDK_PageView* pPageView,
                                            CPDFSDK_Annot* pAnnot,
                                            CFX_RenderDevice* pDevice,
                                            CPDF_Matrix* pUser2Device,
                                            FX_DWORD dwFlags) {
-  ASSERT(pAnnot != NULL);
+  ASSERT(pAnnot);
 
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     pAnnotHandler->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
   } else {
-    if (!pAnnot->IsXFAField())
-      ((CPDFSDK_BAAnnot*)pAnnot)
-          ->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
+    if (!pAnnot->IsXFAField()) {
+      static_cast<CPDFSDK_BAAnnot*>(pAnnot)
+          ->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
+    }
   }
 }
 
 FX_BOOL CPDFSDK_AnnotHandlerMgr::Annot_OnLButtonDown(
     CPDFSDK_PageView* pPageView,
     CPDFSDK_Annot* pAnnot,
     FX_DWORD nFlags,
     const CPDF_Point& point) {
   ASSERT(pAnnot != NULL);
 
@@ skipping 284 matching lines @@
   pInterForm->RemoveMap(pCtrol);
 
   delete pWidget;
 }
 
 void CPDFSDK_BFAnnotHandler::OnDraw(CPDFSDK_PageView* pPageView,
                                     CPDFSDK_Annot* pAnnot,
                                     CFX_RenderDevice* pDevice,
                                     CPDF_Matrix* pUser2Device,
                                     FX_DWORD dwFlags) {
-  ASSERT(pAnnot != NULL);
   CFX_ByteString sSubType = pAnnot->GetSubType();
 
   if (sSubType == BFFT_SIGNATURE) {
-    ((CPDFSDK_BAAnnot*)pAnnot)
-        ->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, NULL);
+    static_cast<CPDFSDK_BAAnnot*>(pAnnot)
+        ->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
   } else {
     if (m_pFormFiller) {
       m_pFormFiller->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
     }
   }
 }
 
 void CPDFSDK_BFAnnotHandler::OnMouseEnter(CPDFSDK_PageView* pPageView,
                                           CPDFSDK_Annot* pAnnot,
                                           FX_DWORD nFlag) {
@@ skipping 720 matching lines @@
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::PrevAnnot() {
   if (m_pos < m_iteratorAnnotList.size())
     return m_iteratorAnnotList[m_iteratorAnnotList.size() - ++m_pos];
   return nullptr;
 }
 
 CPDFSDK_Annot* CPDFSDK_AnnotIterator::Next() {
   return m_bReverse ? PrevAnnot() : NextAnnot();
 }