Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(717)

Unified Diff: core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: s/NULL/nullptr/ Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
index 994c1c8a5a38fde1e4c95f3c9ac40b40576d3085..46cd28c8add32bfb1efcf615f1e7c60f6805c469 100644
--- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
+++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp
@@ -899,7 +899,7 @@ CPDF_Creator::~CPDF_Creator() {
ResetStandardSecurity();
if (m_bEncryptCloned && m_pEncryptDict) {
m_pEncryptDict->Release();
- m_pEncryptDict = NULL;
+ m_pEncryptDict = nullptr;
}
Clear();
}
@@ -1441,7 +1441,7 @@ int32_t CPDF_Creator::WriteDoc_Stage1(IFX_Pause* pPause) {
m_dwFlags &= ~FPDFCREATE_INCREMENTAL;
}
CPDF_Dictionary* pDict = m_pDocument->GetRoot();
- m_pMetadata = pDict ? pDict->GetDirectObjectBy("Metadata") : NULL;
+ m_pMetadata = pDict ? pDict->GetDirectObjectBy("Metadata") : nullptr;
if (m_dwFlags & FPDFCREATE_OBJECTSTREAM) {
m_pXRefStream.reset(new CPDF_XRefStream);
m_pXRefStream->Start();
@@ -1556,7 +1556,7 @@ int32_t CPDF_Creator::WriteDoc_Stage2(IFX_Pause* pPause) {
m_iStage = 27;
}
if (m_iStage == 27) {
- if (NULL != m_pEncryptDict && 0 == m_pEncryptDict->GetObjNum()) {
+ if (m_pEncryptDict && 0 == m_pEncryptDict->GetObjNum()) {
m_dwLastObjNum += 1;
FX_FILESIZE saveOffset = m_Offset;
if (WriteIndirectObj(m_dwLastObjNum, m_pEncryptDict) < 0) {
@@ -1899,7 +1899,7 @@ void CPDF_Creator::Clear() {
m_NewObjNumArray.RemoveAll();
if (m_pIDArray) {
m_pIDArray->Release();
- m_pIDArray = NULL;
+ m_pIDArray = nullptr;
}
}
@@ -1919,14 +1919,14 @@ bool CPDF_Creator::Create(uint32_t flags) {
if (flags & FPDFCREATE_PROGRESSIVE) {
return true;
}
- return Continue(NULL) > -1;
+ return Continue(nullptr) > -1;
}
void CPDF_Creator::InitID(FX_BOOL bDefault) {
- CPDF_Array* pOldIDArray = m_pParser ? m_pParser->GetIDArray() : NULL;
+ CPDF_Array* pOldIDArray = m_pParser ? m_pParser->GetIDArray() : nullptr;
FX_BOOL bNewId = !m_pIDArray;
if (!m_pIDArray) {
m_pIDArray = new CPDF_Array;
- CPDF_Object* pID1 = pOldIDArray ? pOldIDArray->GetObjectAt(0) : NULL;
+ CPDF_Object* pID1 = pOldIDArray ? pOldIDArray->GetObjectAt(0) : nullptr;
if (pID1) {
m_pIDArray->Add(pID1->Clone());
} else {

Powered by Google App Engine
This is Rietveld 408576698