Remove NULL in xfa/

xfa/fxfa/app/xfa_fontmgr.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 "xfa/fxfa/include/xfa_fontmgr.h"
 
 #include <algorithm>
 #include <utility>
@@ skipping 1704 matching lines @@
 }
 const XFA_FONTINFO* XFA_GetFontINFOByFontName(
     const CFX_WideStringC& wsFontName) {
   CFX_WideString wsFontNameTemp(wsFontName);
   wsFontNameTemp.Remove(L' ');
   uint32_t dwCurFontNameHash =
       FX_HashCode_GetW(wsFontNameTemp.AsStringC(), true);
   int32_t iStart = 0;
   int32_t iEnd = sizeof(g_XFAFontsMap) / sizeof(XFA_FONTINFO) - 1;
   int32_t iMid = 0;
-  const XFA_FONTINFO* pFontInfo = NULL;
+  const XFA_FONTINFO* pFontInfo = nullptr;
   do {
     iMid = (iStart + iEnd) / 2;
     uint32_t dwFontNameHash = g_XFAFontsMap[iMid].dwFontNameHash;
     if (dwFontNameHash == dwCurFontNameHash) {
       pFontInfo = &g_XFAFontsMap[iMid];
       break;
     } else if (dwFontNameHash < dwCurFontNameHash) {
       iStart = iMid + 1;
     } else {
       iEnd = iMid - 1;
@@ skipping 55 matching lines @@
 }
 
 CFGAS_GEFont* CXFA_DefFontMgr::GetDefaultFont(
     CXFA_FFDoc* hDoc,
     const CFX_WideStringC& wsFontFamily,
     uint32_t dwFontStyles,
     uint16_t wCodePage) {
   IFGAS_FontMgr* pFDEFontMgr = hDoc->GetApp()->GetFDEFontMgr();
   CFGAS_GEFont* pFont =
       pFDEFontMgr->LoadFont(L"Arial Narrow", dwFontStyles, wCodePage);
   if (!pFont)

[Lei Zhang, 2016/06/23 18:21:44]

braces

[dsinclair, 2016/06/23 18:46:53]

Done.

-    pFont =
-        pFDEFontMgr->LoadFont((const FX_WCHAR*)NULL, dwFontStyles, wCodePage);
+    pFont = pFDEFontMgr->LoadFont((const FX_WCHAR*)nullptr, dwFontStyles,
+                                  wCodePage);
   ASSERT(pFont);
   if (pFont) {
     m_CacheFonts.Add(pFont);
   }
   return pFont;
 }
 struct XFA_PDFFONTNAME {
   const FX_CHAR* lpPsName;
   const FX_CHAR* lpNormal;
   const FX_CHAR* lpBold;
@@ skipping 13 matching lines @@
     if (pair.second)
       pair.second->Release();
   }
 }
 CFGAS_GEFont* CXFA_PDFFontMgr::FindFont(CFX_ByteString strPsName,
                                         FX_BOOL bBold,
                                         FX_BOOL bItalic,
                                         CPDF_Font** pDstPDFFont,
                                         FX_BOOL bStrictMatch) {
   CPDF_Document* pDoc = m_pDoc->GetPDFDoc();
-  if (pDoc == NULL) {
-    return NULL;
+  if (!pDoc) {
+    return nullptr;
   }
   CPDF_Dictionary* pFontSetDict =
       pDoc->GetRoot()->GetDictBy("AcroForm")->GetDictBy("DR");
   if (!pFontSetDict) {
-    return NULL;
+    return nullptr;
   }
   pFontSetDict = pFontSetDict->GetDictBy("Font");
   if (!pFontSetDict) {
-    return NULL;
+    return nullptr;
   }
   strPsName.Remove(' ');
   IFGAS_FontMgr* pFDEFontMgr = m_pDoc->GetApp()->GetFDEFontMgr();
   for (const auto& it : *pFontSetDict) {
     const CFX_ByteString& key = it.first;
     CPDF_Object* pObj = it.second;
     if (!PsNameMatchDRFontName(strPsName.AsStringC(), bBold, bItalic, key,
                                bStrictMatch)) {
       continue;
     }
     CPDF_Dictionary* pFontDict = ToDictionary(pObj->GetDirect());
     if (!pFontDict || pFontDict->GetStringBy("Type") != "Font") {
-      return NULL;
+      return nullptr;
     }
     CPDF_Font* pPDFFont = pDoc->LoadFont(pFontDict);
     if (!pPDFFont) {
-      return NULL;
+      return nullptr;
     }
     if (!pPDFFont->IsEmbedded()) {
       *pDstPDFFont = pPDFFont;
-      return NULL;
+      return nullptr;
     }
     return CFGAS_GEFont::LoadFont(&pPDFFont->m_Font, pFDEFontMgr);
   }
-  return NULL;
+  return nullptr;
 }
 
 CFGAS_GEFont* CXFA_PDFFontMgr::GetFont(const CFX_WideStringC& wsFontFamily,
                                        uint32_t dwFontStyles,
                                        CPDF_Font** pPDFFont,
                                        FX_BOOL bStrictMatch) {
   uint32_t dwHashCode = FX_HashCode_GetW(wsFontFamily, false);
   CFX_ByteString strKey;
   strKey.Format("%u%u", dwHashCode, dwFontStyles);
   auto it = m_FontMap.find(strKey);
@@ skipping 170 matching lines @@
     m_PDFFontMgrMap[hDoc].reset(new CXFA_PDFFontMgr(hDoc));
 }
 
 void CXFA_FontMgr::ReleaseDocFonts(CXFA_FFDoc* hDoc) {
   m_PDFFontMgrMap.erase(hDoc);
 }
 
 void CXFA_FontMgr::SetDefFontMgr(std::unique_ptr<CXFA_DefFontMgr> pFontMgr) {
   m_pDefFontMgr = std::move(pFontMgr);
 }