diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-08-05 12:34:06 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-08-05 12:34:06 -0700 |
commit | ae51c810a44844ef437393c1768be8f7766586b2 (patch) | |
tree | 373bbfa8c8720af43d58a9982beea3ebf10c5d6d /core/src/fpdftext | |
parent | e3166a8c39c8943f6cafb2ffe10bd9564e3eaf16 (diff) | |
download | pdfium-ae51c810a44844ef437393c1768be8f7766586b2.tar.xz |
Kill off last uses of FX_NEW in XFA.
It would seem that this never merged completely.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1277583002 .
Diffstat (limited to 'core/src/fpdftext')
-rw-r--r-- | core/src/fpdftext/fpdf_text.cpp | 6 | ||||
-rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 48402df723..3da9a215a4 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -188,7 +188,7 @@ CTextBaseLine* CTextPage::InsertTextBox(CTextBaseLine* pBaseLine, } } if (pBaseLine == NULL) { - pBaseLine = FX_NEW CTextBaseLine; + pBaseLine = new CTextBaseLine; if (NULL == pBaseLine) { return NULL; } @@ -462,7 +462,7 @@ void CTextPage::FindColumns() { CTextBox* pTextBox = (CTextBox*)pBaseLine->m_TextList.GetAt(j); CTextColumn* pColumn = FindColumn(pTextBox->m_Right); if (pColumn == NULL) { - pColumn = FX_NEW CTextColumn; + pColumn = new CTextColumn; if (pColumn) { pColumn->m_Count = 1; pColumn->m_AvgPos = pTextBox->m_Right; @@ -541,7 +541,7 @@ void CTextBaseLine::InsertTextBox(FX_FLOAT leftx, break; } } - CTextBox* pText = FX_NEW CTextBox; + CTextBox* pText = new CTextBox; if (NULL == pText) { return; } diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 2f6a8db204..9d4555c27e 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -84,17 +84,17 @@ CPDFText_ParseOptions::CPDFText_ParseOptions() IPDF_TextPage* IPDF_TextPage::CreateTextPage( const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions) { - CPDF_TextPage* pTextPageEx = FX_NEW CPDF_TextPage(pPage, ParserOptions); + CPDF_TextPage* pTextPageEx = new CPDF_TextPage(pPage, ParserOptions); return pTextPageEx; } IPDF_TextPage* IPDF_TextPage::CreateTextPage(const CPDF_Page* pPage, int flags) { - CPDF_TextPage* pTextPage = FX_NEW CPDF_TextPage(pPage, flags); + CPDF_TextPage* pTextPage = new CPDF_TextPage(pPage, flags); return pTextPage; } IPDF_TextPage* IPDF_TextPage::CreateTextPage(const CPDF_PageObjects* pObjs, int flags) { - CPDF_TextPage* pTextPage = FX_NEW CPDF_TextPage(pObjs, flags); + CPDF_TextPage* pTextPage = new CPDF_TextPage(pObjs, flags); return pTextPage; } IPDF_TextPageFind* IPDF_TextPageFind::CreatePageFind( @@ -102,10 +102,10 @@ IPDF_TextPageFind* IPDF_TextPageFind::CreatePageFind( if (!pTextPage) { return NULL; } - return FX_NEW CPDF_TextPageFind(pTextPage); + return new CPDF_TextPageFind(pTextPage); } IPDF_LinkExtract* IPDF_LinkExtract::CreateLinkExtract() { - return FX_NEW CPDF_LinkExtract(); + return new CPDF_LinkExtract(); } #define TEXT_BLANK_CHAR L' ' #define TEXT_LINEFEED_CHAR L'\n' @@ -2737,7 +2737,7 @@ FX_BOOL CPDF_LinkExtract::AppendToLinkList(int start, int count, const CFX_WideString& strUrl) { CPDF_LinkExt* linkInfo = NULL; - linkInfo = FX_NEW CPDF_LinkExt; + linkInfo = new CPDF_LinkExt; if (!linkInfo) { return FALSE; } |