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

Unified Diff: xfa/fxfa/parser/xfa_layout_pagemgr_new.h

Issue 2031873003: Get rid of NULLs in xfa/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@nullptr_fpdfsdk
Patch Set: Created 4 years, 6 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
« no previous file with comments | « xfa/fxfa/parser/xfa_layout_itemlayout.cpp ('k') | xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/parser/xfa_layout_pagemgr_new.h
diff --git a/xfa/fxfa/parser/xfa_layout_pagemgr_new.h b/xfa/fxfa/parser/xfa_layout_pagemgr_new.h
index a82c152df9cd3195dae7b17124d0e4e75bbb1871..4109e007afdcd189af182b199d802c1ddd86cd53 100644
--- a/xfa/fxfa/parser/xfa_layout_pagemgr_new.h
+++ b/xfa/fxfa/parser/xfa_layout_pagemgr_new.h
@@ -12,9 +12,9 @@
class CXFA_ContainerRecord {
public:
- CXFA_ContainerRecord(CXFA_ContainerLayoutItem* pPageSet = NULL,
- CXFA_ContainerLayoutItem* pPageArea = NULL,
- CXFA_ContainerLayoutItem* pContentArea = NULL)
+ CXFA_ContainerRecord(CXFA_ContainerLayoutItem* pPageSet = nullptr,
+ CXFA_ContainerLayoutItem* pPageArea = nullptr,
+ CXFA_ContainerLayoutItem* pContentArea = nullptr)
: pCurPageSet(pPageSet),
pCurPageArea(pPageArea),
pCurContentArea(pContentArea) {}
@@ -51,7 +51,7 @@ class CXFA_LayoutPageMgr {
FX_BOOL bDataMerge = FALSE,
FX_BOOL bCreatePage = TRUE);
CXFA_Node* QueryOverflow(CXFA_Node* pFormNode,
- CXFA_LayoutContext* pLayoutContext = NULL);
+ CXFA_LayoutContext* pLayoutContext = nullptr);
FX_BOOL ProcessBookendLeaderOrTrailer(CXFA_Node* pBookendNode,
FX_BOOL bLeader,
CXFA_Node*& pBookendAppendNode);
@@ -70,7 +70,7 @@ class CXFA_LayoutPageMgr {
ASSERT(result);
return result;
}
- CXFA_ContainerRecord* CreateContainerRecord(CXFA_Node* pPageNode = NULL,
+ CXFA_ContainerRecord* CreateContainerRecord(CXFA_Node* pPageNode = nullptr,
FX_BOOL bCreateNew = FALSE);
void AddPageAreaLayoutItem(CXFA_ContainerRecord* pNewRecord,
CXFA_Node* pNewPageArea);
@@ -99,27 +99,28 @@ class CXFA_LayoutPageMgr {
void CreateNextMinRecord(CXFA_Node* pRecordNode);
FX_BOOL FindPageAreaFromPageSet(CXFA_Node* pPageSet,
CXFA_Node* pStartChild,
- CXFA_Node* pTargetPageArea = NULL,
- CXFA_Node* pTargetContentArea = NULL,
+ CXFA_Node* pTargetPageArea = nullptr,
+ CXFA_Node* pTargetContentArea = nullptr,
FX_BOOL bNewPage = FALSE,
FX_BOOL bQuery = FALSE);
- FX_BOOL FindPageAreaFromPageSet_Ordered(CXFA_Node* pPageSet,
- CXFA_Node* pStartChild,
- CXFA_Node* pTargetPageArea = NULL,
- CXFA_Node* pTargetContentArea = NULL,
- FX_BOOL bNewPage = FALSE,
- FX_BOOL bQuery = FALSE);
+ FX_BOOL FindPageAreaFromPageSet_Ordered(
+ CXFA_Node* pPageSet,
+ CXFA_Node* pStartChild,
+ CXFA_Node* pTargetPageArea = nullptr,
+ CXFA_Node* pTargetContentArea = nullptr,
+ FX_BOOL bNewPage = FALSE,
+ FX_BOOL bQuery = FALSE);
FX_BOOL FindPageAreaFromPageSet_SimplexDuplex(
CXFA_Node* pPageSet,
CXFA_Node* pStartChild,
- CXFA_Node* pTargetPageArea = NULL,
- CXFA_Node* pTargetContentArea = NULL,
+ CXFA_Node* pTargetPageArea = nullptr,
+ CXFA_Node* pTargetContentArea = nullptr,
FX_BOOL bNewPage = FALSE,
FX_BOOL bQuery = FALSE,
XFA_ATTRIBUTEENUM ePreferredPosition = XFA_ATTRIBUTEENUM_First);
FX_BOOL MatchPageAreaOddOrEven(CXFA_Node* pPageArea, FX_BOOL bLastMatch);
CXFA_Node* GetNextAvailPageArea(CXFA_Node* pTargetPageArea,
- CXFA_Node* pTargetContentArea = NULL,
+ CXFA_Node* pTargetContentArea = nullptr,
FX_BOOL bNewPage = FALSE,
FX_BOOL bQuery = FALSE);
FX_BOOL GetNextContentArea(CXFA_Node* pTargetContentArea);
« no previous file with comments | « xfa/fxfa/parser/xfa_layout_itemlayout.cpp ('k') | xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698