Index: xfa/fgas/layout/fgas_textbreak.h |
diff --git a/xfa/fgas/layout/fgas_textbreak.h b/xfa/fgas/layout/fgas_textbreak.h |
index 01e688f15d8ba3de0f15d558185938d0d02ce971..4b3630aa2b688281152089c3689d4f7a4cd77629 100644 |
--- a/xfa/fgas/layout/fgas_textbreak.h |
+++ b/xfa/fgas/layout/fgas_textbreak.h |
@@ -124,19 +124,19 @@ class CFX_TxtPiece : public CFX_Target { |
m_iHorizontalScale(100), |
m_iVerticalScale(100), |
m_dwCharStyles(0), |
- m_pChars(NULL), |
- m_pUserData(NULL) {} |
+ m_pChars(nullptr), |
+ m_pUserData(nullptr) {} |
int32_t GetEndPos() const { |
return m_iWidth < 0 ? m_iStartPos : m_iStartPos + m_iWidth; |
} |
int32_t GetLength() const { return m_iChars; } |
int32_t GetEndChar() const { return m_iStartChar + m_iChars; } |
CFX_TxtChar* GetCharPtr(int32_t index) const { |
- ASSERT(index > -1 && index < m_iChars && m_pChars != NULL); |
+ ASSERT(index > -1 && index < m_iChars); |
return m_pChars->GetDataPtr(m_iStartChar + index); |
} |
void GetString(FX_WCHAR* pText) const { |
- ASSERT(pText != NULL); |
+ ASSERT(pText); |
int32_t iEndChar = m_iStartChar + m_iChars; |
CFX_Char* pChar; |
for (int32_t i = m_iStartChar; i < iEndChar; i++) { |
@@ -151,7 +151,7 @@ class CFX_TxtPiece : public CFX_Target { |
wsText.ReleaseBuffer(m_iChars); |
} |
void GetWidths(int32_t* pWidths) const { |
- ASSERT(pWidths != NULL); |
+ ASSERT(pWidths); |
int32_t iEndChar = m_iStartChar + m_iChars; |
CFX_Char* pChar; |
for (int32_t i = m_iStartChar; i < iEndChar; i++) { |
@@ -253,8 +253,8 @@ class CFX_TxtBreak { |
int32_t GetDisplayPos(const FX_TXTRUN* pTxtRun, |
FXTEXT_CHARPOS* pCharPos, |
FX_BOOL bCharCode = FALSE, |
- CFX_WideString* pWSForms = NULL, |
- FX_AdjustCharDisplayPos pAdjustPos = NULL) const; |
+ CFX_WideString* pWSForms = nullptr, |
+ FX_AdjustCharDisplayPos pAdjustPos = nullptr) const; |
int32_t GetCharRects(const FX_TXTRUN* pTxtRun, |
CFX_RectFArray& rtArray, |
FX_BOOL bCharBBox = FALSE) const; |