| 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 f7376d250e5c08e82376507497c025bb33bccf94..4085d4d286b12d3b23b18f741e39427632d78033 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;
|
| @@ -68,7 +68,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,7 +78,7 @@ class CXFA_ItemLayoutProcessor {
|
|
|
| void SetCurrentComponentSize(FX_FLOAT fWidth, FX_FLOAT fHeight);
|
| inline CXFA_Node* GetFormNode() { return m_pFormNode; }
|
| - inline FX_BOOL HasLayoutItem() { return m_pLayoutItem != NULL; }
|
| + inline FX_BOOL HasLayoutItem() { return !!m_pLayoutItem; }
|
| CXFA_ContentLayoutItem* ExtractLayoutItem();
|
|
|
| static FX_BOOL IncrementRelayoutNode(CXFA_LayoutProcessor* pLayoutProcessor,
|
| @@ -138,14 +138,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(
|
|
|