Replace FX_NEW with new, remove tests from fpdftext

core/src/fpdftext/fpdf_text.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/fpdfapi/fpdf_page.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdftext/fpdf_text.h"
 #include "txtproc.h"
@@ skipping 151 matching lines @@
             CTextBaseLine* pExistLine = (CTextBaseLine*)m_BaseLines.GetAt(i);
             if (pExistLine->m_BaseLine == basey) {
                 pBaseLine = pExistLine;
                 break;
             }
             if (pExistLine->m_BaseLine < basey) {
                 break;
             }
         }
         if (pBaseLine == NULL) {
-            pBaseLine = FX_NEW CTextBaseLine;
-            if (NULL == pBaseLine) {
-                return NULL;
-            }
+            pBaseLine = new CTextBaseLine;
             pBaseLine->m_BaseLine = basey;
             m_BaseLines.InsertAt(i, pBaseLine);
         }
     }
     CFX_WideString text;
     FX_LPCSTR pStr = str;
     int len = str.GetLength(), offset = 0;
     while (offset < len) {
         FX_DWORD ch = pFont->GetNextChar(pStr, len, offset);
         CFX_WideString unicode_str = pFont->UnicodeFromCharCode(ch);
@@ skipping 260 matching lines @@
 }
 void CTextPage::FindColumns()
 {
     int i;
     for (i = 0; i < m_BaseLines.GetSize(); i ++) {
         CTextBaseLine* pBaseLine = (CTextBaseLine*)m_BaseLines.GetAt(i);
         for (int j = 0; j < pBaseLine->m_TextList.GetSize(); j ++) {
             CTextBox* pTextBox = (CTextBox*)pBaseLine->m_TextList.GetAt(j);
             CTextColumn* pColumn = FindColumn(pTextBox->m_Right);
             if (pColumn == NULL) {
-                pColumn = FX_NEW CTextColumn;
-                if (pColumn) {
-                    pColumn->m_Count = 1;
-                    pColumn->m_AvgPos = pTextBox->m_Right;
-                    pColumn->m_TextPos = -1;
-                    m_TextColumns.Add(pColumn);
-                }
+                pColumn = new CTextColumn;
+                pColumn->m_Count = 1;
+                pColumn->m_AvgPos = pTextBox->m_Right;
+                pColumn->m_TextPos = -1;
+                m_TextColumns.Add(pColumn);
             } else {
                 pColumn->m_AvgPos = (pColumn->m_Count * pColumn->m_AvgPos + pTextBox->m_Right) /
                                     (pColumn->m_Count + 1);
                 pColumn->m_Count ++;
             }
         }
     }
     int mincount = m_BaseLines.GetSize() / 4;
     for (i = 0; i < m_TextColumns.GetSize(); i ++) {
         CTextColumn* pTextColumn = (CTextColumn*)m_TextColumns.GetAt(i);
@@ skipping 52 matching lines @@
     if (m_MaxFontSizeV < fontsize_v) {
         m_MaxFontSizeV = fontsize_v;
     }
     int i;
     for (i = 0; i < m_TextList.GetSize(); i ++) {
         CTextBox* pText = (CTextBox*)m_TextList.GetAt(i);
         if (pText->m_Left > leftx) {
             break;
         }
     }
-    CTextBox* pText = FX_NEW CTextBox;
-    if (NULL == pText) {
-        return;
-    }
+    CTextBox* pText = new CTextBox;
     pText->m_Text = text;
     pText->m_Left = leftx;
     pText->m_Right = rightx;
     pText->m_Top = topy;
     pText->m_Bottom = bottomy;
     pText->m_SpaceWidth = spacew;
     pText->m_FontSizeV = fontsize_v;
     pText->m_pColumn = NULL;
     m_TextList.InsertAt(i, pText);
 }
@@ skipping 232 matching lines @@
 {
     buffer.EstimateSize(0, 10240);
     CPDF_Page page;
     page.Load(pDoc, pPage);
     CPDF_ParseOptions options;
     options.m_bTextOnly = TRUE;
     options.m_bSeparateForm = FALSE;
     page.ParseContent(&options);
     _PDF_GetTextStream_Unicode(buffer, &page, TRUE, NULL);
 }