Merge to XFA: Use stdint.h types throughout PDFium.

fpdfsdk/src/formfiller/FFL_CBA_Fontmap.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/formfiller/FormFiller.h"
 #include "../../include/formfiller/FFL_CBA_Fontmap.h"
 
 CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, IFX_SystemHandler* pSystemHandler) :
@@ skipping 27 matching lines @@
 
 void CBA_FontMap::Reset()
 {
         Empty();
         m_pDefaultFont = NULL;
         m_sDefaultFontName = "";
 }
 
 void CBA_FontMap::Initial(FX_LPCSTR fontname)
 {
-        FX_INT32 nCharset = DEFAULT_CHARSET;
+        int32_t nCharset = DEFAULT_CHARSET;
 
         if (!m_pDefaultFont)
         {
                 m_pDefaultFont = GetAnnotDefaultFont(m_sDefaultFontName);       
                 if (m_pDefaultFont)
                 {
                         if (const CFX_SubstFont* pSubstFont = m_pDefaultFont->GetSubstFont())
                                 nCharset = pSubstFont->m_Charset;
                         else
                         {
@@ skipping 17 matching lines @@
         ASSERT(pFont != NULL);
 
         if (m_pDefaultFont) return;
 
         m_pDefaultFont = pFont;
         m_sDefaultFontName = sFontName;
 
 //      if (m_sDefaultFontName.IsEmpty())
 //              m_sDefaultFontName = pFont->GetFontTypeName();
 
-        FX_INT32 nCharset = DEFAULT_CHARSET;
+        int32_t nCharset = DEFAULT_CHARSET;
         if (const CFX_SubstFont* pSubstFont = m_pDefaultFont->GetSubstFont())
                 nCharset = pSubstFont->m_Charset;
         AddFontData(m_pDefaultFont, m_sDefaultFontName, nCharset);
 }
 
-CPDF_Font* CBA_FontMap::FindFontSameCharset(CFX_ByteString& sFontAlias, FX_INT32 nCharset)
+CPDF_Font* CBA_FontMap::FindFontSameCharset(CFX_ByteString& sFontAlias, int32_t nCharset)
 {
         ASSERT(m_pAnnotDict != NULL);
 
         if (m_pAnnotDict->GetString("Subtype") == "Widget")
         {
                 CPDF_Document* pDocument = GetDocument();
                 ASSERT(pDocument != NULL);
 
                 CPDF_Dictionary * pRootDict = pDocument->GetRoot();
                 if (!pRootDict) return NULL;
 
                 CPDF_Dictionary* pAcroFormDict = pRootDict->GetDict("AcroForm");
                 if (!pAcroFormDict) return NULL;
 
                 CPDF_Dictionary * pDRDict = pAcroFormDict->GetDict("DR");
                 if (!pDRDict) return NULL;
 
                 return FindResFontSameCharset(pDRDict, sFontAlias, nCharset);
         }
 
         return NULL;
 }
 
 CPDF_Document* CBA_FontMap::GetDocument()
 {
         return m_pDocument;
 }
 
 CPDF_Font* CBA_FontMap::FindResFontSameCharset(CPDF_Dictionary* pResDict, CFX_ByteString& sFontAlias, 
-                                                                                                        FX_INT32 nCharset)
+                                                                                                        int32_t nCharset)
 {
         if (!pResDict) return NULL;
 
         CPDF_Document* pDocument = GetDocument();
         ASSERT(pDocument != NULL);
 
         CPDF_Dictionary* pFonts = pResDict->GetDict("Font");
         if (pFonts == NULL) return NULL;
 
         CPDF_Font* pFind = NULL;
@@ skipping 46 matching lines @@
         }
 
         //to avoid checkbox and radiobutton
         CPDF_Object* pObject = pAPDict->GetElement(m_sAPType);
         if (pObject && pObject->GetType() == PDFOBJ_DICTIONARY)
                 return;
 
         CPDF_Stream* pStream = pAPDict->GetStream(m_sAPType);
         if (pStream == NULL) 
         {
-                pStream = FX_NEW CPDF_Stream(NULL, 0, NULL);
-                FX_INT32 objnum = m_pDocument->AddIndirectObject(pStream);
+                pStream = new CPDF_Stream(NULL, 0, NULL);
+                int32_t objnum = m_pDocument->AddIndirectObject(pStream);
                 pAPDict->SetAtReference(m_sAPType, m_pDocument, objnum);
         }
 
         CPDF_Dictionary * pStreamDict = pStream->GetDict();
 
         if (!pStreamDict)
         {
                 pStreamDict = FX_NEW CPDF_Dictionary;
                 pStream->InitStream(NULL, 0, pStreamDict);
         }
 
         if (pStreamDict)
         {
                 CPDF_Dictionary* pStreamResList = pStreamDict->GetDict("Resources");
                 if (!pStreamResList)
                 {
                         pStreamResList = FX_NEW CPDF_Dictionary();
                         pStreamDict->SetAt("Resources", pStreamResList);
                 }
 
                 if (pStreamResList) 
                 {
                         CPDF_Dictionary* pStreamResFontList = pStreamResList->GetDict("Font");
                         if (!pStreamResFontList) 
                         {
-                                pStreamResFontList = FX_NEW CPDF_Dictionary;
-                                FX_INT32 objnum = m_pDocument->AddIndirectObject(pStreamResFontList);
+                                pStreamResFontList = new CPDF_Dictionary;
+                                int32_t objnum = m_pDocument->AddIndirectObject(pStreamResFontList);
                                 pStreamResList->SetAtReference("Font", m_pDocument, objnum);
                         }
                         if (!pStreamResFontList->KeyExist(sAlias))
                                 pStreamResFontList->SetAtReference(sAlias, m_pDocument, pFont->GetFontDict());
                 }
         }
 }
 
 CPDF_Font* CBA_FontMap::GetAnnotDefaultFont(CFX_ByteString &sAlias)
 {
@@ skipping 65 matching lines @@
 }
 
 void CBA_FontMap::SetAPType(const CFX_ByteString& sAPType)
 {
         m_sAPType = sAPType;
 
         Reset();
         Initial();
 }