Replace FX_NEW with new, remove tests in fpdfdoc.

core/src/fpdfdoc/doc_vt.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/fpdfdoc/fpdf_doc.h"
 #include "../../include/fpdfdoc/fpdf_vt.h"
 #include "pdf_vt.h"
 const FX_BYTE gFontSizeSteps[] = {      4, 6, 8, 9, 10, 12, 14, 18, 20, 25,     30, 35, 40, 45, 50,     55, 60, 70, 80, 90,     100, 110, 120, 130, 144};
@@ skipping 59 matching lines @@
 void CSection::ResetLinePlace()
 {
     for (FX_INT32 i = 0, sz = m_LineArray.GetSize(); i < sz; i++) {
         if (CLine * pLine = m_LineArray.GetAt(i)) {
             pLine->LinePlace = CPVT_WordPlace(SecPlace.nSecIndex, i, -1);
         }
     }
 }
 CPVT_WordPlace CSection::AddWord(const CPVT_WordPlace & place, const CPVT_WordInfo & wordinfo)
 {
-    if (CPVT_WordInfo * pWord = FX_NEW CPVT_WordInfo(wordinfo)) {
-        FX_INT32 nWordIndex = FPDF_MAX(FPDF_MIN(place.nWordIndex, this->m_WordArray.GetSize()), 0);
-        if (nWordIndex == m_WordArray.GetSize()) {
-            m_WordArray.Add(pWord);
-        } else {
-            m_WordArray.InsertAt(nWordIndex, pWord);
-        }
+    CPVT_WordInfo * pWord = new CPVT_WordInfo(wordinfo);
+    FX_INT32 nWordIndex = FPDF_MAX(FPDF_MIN(place.nWordIndex, this->m_WordArray.GetSize()), 0);
+    if (nWordIndex == m_WordArray.GetSize()) {
+        m_WordArray.Add(pWord);
+    } else {
+        m_WordArray.InsertAt(nWordIndex, pWord);
     }
     return place;
 }
 CPVT_WordPlace CSection::AddLine(const CPVT_LineInfo & lineinfo)
 {
     return CPVT_WordPlace(SecPlace.nSecIndex, m_LineArray.Add(lineinfo), -1);
 }
 CPVT_FloatRect CSection::Rearrange()
 {
     ASSERT(m_pVT != NULL);
@@ skipping 730 matching lines @@
         delete m_pVTIterator;
         m_pVTIterator = NULL;
     }
     ResetAll();
 }
 void CPDF_VariableText::Initialize()
 {
     if (!m_bInitial) {
         CPVT_SectionInfo secinfo;
         if (m_bRichText) {
-            secinfo.pSecProps = FX_NEW CPVT_SecProps(0.0f, 0.0f, 0);
-            secinfo.pWordProps = FX_NEW CPVT_WordProps(GetDefaultFontIndex(), PVT_DEFAULT_FONTSIZE, 0, 0, 0);
+            secinfo.pSecProps = new CPVT_SecProps(0.0f, 0.0f, 0);
+            secinfo.pWordProps = new CPVT_WordProps(GetDefaultFontIndex(), PVT_DEFAULT_FONTSIZE, 0, 0, 0);
         }
         CPVT_WordPlace place;
         place.nSecIndex = 0;
         AddSection(place, secinfo);
         CPVT_LineInfo lineinfo;
         lineinfo.fLineAscent = GetFontAscent(GetDefaultFontIndex(), GetFontSize());
         lineinfo.fLineDescent = GetFontDescent(GetDefaultFontIndex(), GetFontSize());
         AddLine(place, lineinfo);
         if (CSection * pSection = m_SectionArray.GetAt(0)) {
             pSection->ResetLinePlace();
@@ skipping 12 matching lines @@
     FX_INT32 nTotlaWords = this->GetTotalWords();
     if (m_nLimitChar > 0 && nTotlaWords >= m_nLimitChar) {
         return place;
     }
     if (m_nCharArray > 0 && nTotlaWords >= m_nCharArray) {
         return place;
     }
     CPVT_WordPlace newplace = place;
     newplace.nWordIndex ++;
     if (m_bRichText) {
-        CPVT_WordProps * pNewProps = pWordProps ? FX_NEW CPVT_WordProps(*pWordProps) : FX_NEW CPVT_WordProps();
-        if (pNewProps) {
-            pNewProps->nFontIndex = GetWordFontIndex(word, charset, pWordProps->nFontIndex);
-            return AddWord(newplace, CPVT_WordInfo(word, charset, -1, pNewProps));
-        }
+        CPVT_WordProps * pNewProps = pWordProps ? new CPVT_WordProps(*pWordProps) : new CPVT_WordProps();
+        pNewProps->nFontIndex = GetWordFontIndex(word, charset, pWordProps->nFontIndex);
+        return AddWord(newplace, CPVT_WordInfo(word, charset, -1, pNewProps));
     } else {
         FX_INT32 nFontIndex = GetSubWord() > 0 ? GetDefaultFontIndex() : GetWordFontIndex(word, charset, GetDefaultFontIndex());
         return AddWord(newplace, CPVT_WordInfo(word, charset, nFontIndex, NULL));
     }
     return place;
 }
 CPVT_WordPlace CPDF_VariableText::InsertSection(const CPVT_WordPlace & place, const CPVT_SecProps * pSecProps,
         const CPVT_WordProps * pWordProps)
 {
     FX_INT32 nTotlaWords = this->GetTotalWords();
     if (m_nLimitChar > 0 && nTotlaWords >= m_nLimitChar) {
         return place;
     }
     if (m_nCharArray > 0 && nTotlaWords >= m_nCharArray) {
         return place;
     }
     if (!m_bMultiLine) {
         return place;
     }
     CPVT_WordPlace wordplace = place;
     UpdateWordPlace(wordplace);
     CPVT_WordPlace newplace = place;
     if (CSection * pSection = m_SectionArray.GetAt(wordplace.nSecIndex)) {
         CPVT_WordPlace NewPlace(wordplace.nSecIndex + 1, 0, -1);
         CPVT_SectionInfo secinfo;
         if (m_bRichText) {
             if (pSecProps) {
-                secinfo.pSecProps = FX_NEW CPVT_SecProps(*pSecProps);
+                secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
             }
             if (pWordProps) {
-                secinfo.pWordProps = FX_NEW CPVT_WordProps(*pWordProps);
+                secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
             }
         }
         AddSection(NewPlace, secinfo);
         newplace = NewPlace;
         if (CSection * pNewSection = m_SectionArray.GetAt(NewPlace.nSecIndex)) {
             for (FX_INT32 w = wordplace.nWordIndex + 1, sz = pSection->m_WordArray.GetSize(); w < sz; w++) {
                 if (CPVT_WordInfo * pWord = pSection->m_WordArray.GetAt(w)) {
                     NewPlace.nWordIndex++;
                     pNewSection->AddWord(NewPlace, *pWord);
                 }
@@ skipping 65 matching lines @@
 }
 void CPDF_VariableText::SetText(FX_LPCWSTR text, FX_INT32 charset, const CPVT_SecProps * pSecProps,
                                 const CPVT_WordProps * pWordProps)
 {
     DeleteWords(CPVT_WordRange(GetBeginWordPlace(), GetEndWordPlace()));
     CFX_WideString swText = text;
     CPVT_WordPlace      wp(0, 0, -1);
     CPVT_SectionInfo secinfo;
     if (m_bRichText) {
         if (pSecProps) {
-            secinfo.pSecProps = FX_NEW CPVT_SecProps(*pSecProps);
+            secinfo.pSecProps = new CPVT_SecProps(*pSecProps);
         }
         if (pWordProps) {
-            secinfo.pWordProps = FX_NEW CPVT_WordProps(*pWordProps);
+            secinfo.pWordProps = new CPVT_WordProps(*pWordProps);
         }
     }
     if (CSection * pSection = m_SectionArray.GetAt(0)) {
         pSection->m_SecInfo = secinfo;
     }
     FX_INT32 nCharCount = 0;
     for (FX_INT32 i = 0, sz = swText.GetLength(); i < sz; i++) {
         if (m_nLimitChar > 0 && nCharCount >= m_nLimitChar) {
             break;
         }
@@ skipping 267 matching lines @@
         delete m_SectionArray.GetAt(s);
     }
     m_SectionArray.RemoveAll();
 }
 CPVT_WordPlace CPDF_VariableText::AddSection(const CPVT_WordPlace & place, const CPVT_SectionInfo & secinfo)
 {
     if (IsValid() && !m_bMultiLine) {
         return place;
     }
     FX_INT32 nSecIndex = FPDF_MAX(FPDF_MIN(place.nSecIndex, m_SectionArray.GetSize()), 0);
-    CSection * pSection = FX_NEW CSection(this);
-    if (!pSection) {
-        return place;
-    }
+    CSection * pSection = new CSection(this);
     pSection->m_SecInfo = secinfo;
     pSection->SecPlace.nSecIndex = nSecIndex;
     if (nSecIndex == m_SectionArray.GetSize()) {
         m_SectionArray.Add(pSection);
     } else {
         m_SectionArray.InsertAt(nSecIndex, pSection);
     }
     return place;
 }
 CPVT_WordPlace CPDF_VariableText::AddLine(const CPVT_WordPlace & place, const CPVT_LineInfo & lineinfo)
@@ skipping 372 matching lines @@
 {
     return m_pVTProvider ? m_pVTProvider->GetDefaultFontIndex() : -1;
 }
 FX_BOOL CPDF_VariableText::IsLatinWord(FX_WORD word)
 {
     return m_pVTProvider ? m_pVTProvider->IsLatinWord(word) : FALSE;
 }
 IPDF_VariableText_Iterator * CPDF_VariableText::GetIterator()
 {
     if (!m_pVTIterator) {
-        return m_pVTIterator = FX_NEW CPDF_VariableText_Iterator(this);
+        m_pVTIterator = new CPDF_VariableText_Iterator(this);
     }
     return m_pVTIterator;
 }
 IPDF_VariableText_Provider*     CPDF_VariableText::SetProvider(IPDF_VariableText_Provider * pProvider)
 {
     IPDF_VariableText_Provider* pOld = m_pVTProvider;
     m_pVTProvider = pProvider;
     return pOld;
 }
 CPDF_VariableText_Iterator::CPDF_VariableText_Iterator(CPDF_VariableText * pVT):
@@ skipping 164 matching lines @@
         if (pSection->m_SecInfo.pSecProps) {
             *pSection->m_SecInfo.pSecProps = section.SecProps;
         }
         if (pSection->m_SecInfo.pWordProps) {
             *pSection->m_SecInfo.pWordProps = section.WordProps;
         }
         return TRUE;
     }
     return FALSE;
 }