Index: xfa/fxfa/app/xfa_textlayout.h |
diff --git a/xfa/fxfa/app/xfa_textlayout.h b/xfa/fxfa/app/xfa_textlayout.h |
index a4bd9cede7d593e60c85f8244a37c856ebdd03a7..4632f46400f5e6068226aefb5482b4008730df8c 100644 |
--- a/xfa/fxfa/app/xfa_textlayout.h |
+++ b/xfa/fxfa/app/xfa_textlayout.h |
@@ -151,9 +151,9 @@ class CXFA_LoaderContext { |
m_fStartLineOffset(0), |
m_iChar(0), |
m_iTotalLines(-1), |
- m_pXMLNode(NULL), |
- m_pNode(NULL), |
- m_pParentStyle(NULL), |
+ m_pXMLNode(nullptr), |
+ m_pNode(nullptr), |
+ m_pParentStyle(nullptr), |
m_dwFlags(0) {} |
FX_BOOL m_bSaveLineHeight; |
FX_FLOAT m_fWidth; |
@@ -337,7 +337,7 @@ class CXFA_TextLayout { |
FX_BOOL CalcSize(const CFX_SizeF& minSize, |
const CFX_SizeF& maxSize, |
CFX_SizeF& defaultSize); |
- FX_BOOL Layout(const CFX_SizeF& size, FX_FLOAT* fHeight = NULL); |
+ FX_BOOL Layout(const CFX_SizeF& size, FX_FLOAT* fHeight = nullptr); |
void ItemBlocks(const CFX_RectF& rtText, int32_t iBlockIndex); |
FX_BOOL DrawString(CFX_RenderDevice* pFxDevice, |
const CFX_Matrix& tmDoc2Device, |
@@ -359,7 +359,7 @@ class CXFA_TextLayout { |
FDE_CSSDISPLAY eDisplay, |
FX_FLOAT fLineWidth, |
CFDE_XMLNode* pXMLNode, |
- IFDE_CSSComputedStyle* pParentStyle = NULL); |
+ IFDE_CSSComputedStyle* pParentStyle = nullptr); |
FX_BOOL Loader(const CFX_SizeF& szText, |
FX_FLOAT& fLinePos, |
FX_BOOL bSavePieces = TRUE); |
@@ -372,7 +372,7 @@ class CXFA_TextLayout { |
FX_FLOAT& fLinePos, |
IFDE_CSSComputedStyle* pParentStyle, |
FX_BOOL bSavePieces, |
- CXFA_LinkUserData* pLinkData = NULL, |
+ CXFA_LinkUserData* pLinkData = nullptr, |
FX_BOOL bEndBreak = TRUE, |
FX_BOOL bIsOl = FALSE, |
int32_t iLiCount = 0); |