Index: xfa/fxfa/parser/xfa_layout_itemlayout.h |
diff --git a/xfa/fxfa/parser/xfa_layout_itemlayout.h b/xfa/fxfa/parser/xfa_layout_itemlayout.h |
index fc279893c868eeb21d34b9e83a469ba728894111..f326715339aa42698b894feefbd34658fd09a9b0 100644 |
--- a/xfa/fxfa/parser/xfa_layout_itemlayout.h |
+++ b/xfa/fxfa/parser/xfa_layout_itemlayout.h |
@@ -47,12 +47,12 @@ enum XFA_ItemLayoutProcessorStages { |
class CXFA_LayoutContext { |
public: |
CXFA_LayoutContext() |
- : m_prgSpecifiedColumnWidths(NULL), |
+ : m_prgSpecifiedColumnWidths(nullptr), |
m_fCurColumnWidth(0), |
m_bCurColumnWidthAvaiable(FALSE), |
- m_pOverflowProcessor(NULL), |
- m_pOverflowNode(NULL) {} |
- ~CXFA_LayoutContext() { m_pOverflowProcessor = NULL; } |
+ m_pOverflowProcessor(nullptr), |
+ m_pOverflowNode(nullptr) {} |
+ ~CXFA_LayoutContext() { m_pOverflowProcessor = nullptr; } |
CFX_ArrayTemplate<FX_FLOAT>* m_prgSpecifiedColumnWidths; |
FX_FLOAT m_fCurColumnWidth; |
FX_BOOL m_bCurColumnWidthAvaiable; |
@@ -69,7 +69,7 @@ class CXFA_ItemLayoutProcessor { |
FX_BOOL bUseBreakControl, |
FX_FLOAT fHeightLimit, |
FX_FLOAT fRealHeight = XFA_LAYOUT_FLOAT_MAX, |
- CXFA_LayoutContext* pContext = NULL); |
+ CXFA_LayoutContext* pContext = nullptr); |
void GetCurrentComponentPos(FX_FLOAT& fAbsoluteX, FX_FLOAT& fAbsoluteY); |
@@ -78,8 +78,8 @@ class CXFA_ItemLayoutProcessor { |
void SetCurrentComponentPos(FX_FLOAT fAbsoluteX, FX_FLOAT fAbsoluteY); |
void SetCurrentComponentSize(FX_FLOAT fWidth, FX_FLOAT fHeight); |
- inline CXFA_Node* GetFormNode() { return m_pFormNode; } |
- inline FX_BOOL HasLayoutItem() { return m_pLayoutItem != NULL; } |
+ CXFA_Node* GetFormNode() { return m_pFormNode; } |
+ FX_BOOL HasLayoutItem() { return !!m_pLayoutItem; } |
CXFA_ContentLayoutItem* ExtractLayoutItem(); |
static FX_BOOL IncrementRelayoutNode(CXFA_LayoutProcessor* pLayoutProcessor, |
@@ -139,14 +139,14 @@ class CXFA_ItemLayoutProcessor { |
CXFA_ContentLayoutItem* CreateContentLayoutItem(CXFA_Node* pFormNode); |
protected: |
- void DoLayoutPositionedContainer(CXFA_LayoutContext* pContext = NULL); |
+ void DoLayoutPositionedContainer(CXFA_LayoutContext* pContext = nullptr); |
void DoLayoutTableContainer(CXFA_Node* pLayoutNode); |
XFA_ItemLayoutProcessorResult DoLayoutFlowedContainer( |
FX_BOOL bUseBreakControl, |
XFA_ATTRIBUTEENUM eFlowStrategy, |
FX_FLOAT fHeightLimit, |
FX_FLOAT fRealHeight, |
- CXFA_LayoutContext* pContext = NULL, |
+ CXFA_LayoutContext* pContext = nullptr, |
FX_BOOL bRootForceTb = FALSE); |
void DoLayoutField(); |
void XFA_ItemLayoutProcessor_GotoNextContainerNode( |