summaryrefslogtreecommitdiff
path: root/core/fpdftext
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-06-07 10:46:22 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-07 10:46:23 -0700
commit4997b22f84307521a62838f874928bf56cd3423c (patch)
treead11d99ac0a491ee222e9d0a42ec3b6ad3354e2a /core/fpdftext
parent0687e76dc259c678b3f29a6608331f07ffd8f1e2 (diff)
downloadpdfium-4997b22f84307521a62838f874928bf56cd3423c.tar.xz
Get rid of NULLs in core/
Review-Url: https://codereview.chromium.org/2032613003
Diffstat (limited to 'core/fpdftext')
-rw-r--r--core/fpdftext/fpdf_text_int.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/fpdftext/fpdf_text_int.cpp b/core/fpdftext/fpdf_text_int.cpp
index 1f8ab75e85..fd1214b588 100644
--- a/core/fpdftext/fpdf_text_int.cpp
+++ b/core/fpdftext/fpdf_text_int.cpp
@@ -177,7 +177,7 @@ void CPDF_TextPage::ParseTextPage() {
m_bIsParsed = false;
m_TextBuf.Clear();
m_CharList.clear();
- m_pPreTextObj = NULL;
+ m_pPreTextObj = nullptr;
ProcessObject();
m_bIsParsed = true;
@@ -836,7 +836,7 @@ void CPDF_TextPage::AddCharInfoByLRDirection(FX_WCHAR wChar,
if (!IsControlChar(info)) {
info.m_Index = m_TextBuf.GetLength();
if (wChar >= 0xFB00 && wChar <= 0xFB06) {
- FX_WCHAR* pDst = NULL;
+ FX_WCHAR* pDst = nullptr;
FX_STRSIZE nCount = Unicode_GetNormalization(wChar, pDst);
if (nCount >= 1) {
pDst = FX_Alloc(FX_WCHAR, nCount);
@@ -864,7 +864,7 @@ void CPDF_TextPage::AddCharInfoByRLDirection(FX_WCHAR wChar,
if (!IsControlChar(info)) {
info.m_Index = m_TextBuf.GetLength();
wChar = FX_GetMirrorChar(wChar, TRUE, FALSE);
- FX_WCHAR* pDst = NULL;
+ FX_WCHAR* pDst = nullptr;
FX_STRSIZE nCount = Unicode_GetNormalization(wChar, pDst);
if (nCount >= 1) {
pDst = FX_Alloc(FX_WCHAR, nCount);
@@ -1019,7 +1019,7 @@ FPDFText_MarkedContent CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) {
CFX_WideString actText;
FX_BOOL bExist = FALSE;
- CPDF_Dictionary* pDict = NULL;
+ CPDF_Dictionary* pDict = nullptr;
int n = 0;
for (n = 0; n < nContentMark; n++) {
CPDF_ContentMarkItem& item = pMarkData->GetItem(n);
@@ -1085,7 +1085,7 @@ void CPDF_TextPage::ProcessMarkedContent(PDFTEXT_Obj Obj) {
if (nContentMark < 1)
return;
CFX_WideString actText;
- CPDF_Dictionary* pDict = NULL;
+ CPDF_Dictionary* pDict = nullptr;
for (int n = 0; n < nContentMark; n++) {
CPDF_ContentMarkItem& item = pMarkData->GetItem(n);
if (item.GetParamType() == CPDF_ContentMarkItem::ParamType::None)
@@ -1760,7 +1760,7 @@ FX_BOOL CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info) {
}
info.m_Index = m_TextBuf.GetLength();
info.m_Unicode = unicode;
- info.m_pTextObj = NULL;
+ info.m_pTextObj = nullptr;
info.m_CharCode = CPDF_Font::kInvalidCharCode;
info.m_Flag = FPDFTEXT_CHAR_GENERATED;
int preWidth = 0;