diff options
Diffstat (limited to 'xfa/fde')
| -rw-r--r-- | xfa/fde/css/fde_cssdatatable.cpp | 2 | ||||
| -rw-r--r-- | xfa/fde/css/fde_cssstylesheet.cpp | 3 | ||||
| -rw-r--r-- | xfa/fde/fde_gedevice.cpp | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fde/css/fde_cssdatatable.cpp b/xfa/fde/css/fde_cssdatatable.cpp index c2767e7eb2..9bccd32602 100644 --- a/xfa/fde/css/fde_cssdatatable.cpp +++ b/xfa/fde/css/fde_cssdatatable.cpp @@ -921,7 +921,7 @@ CFDE_CSSPrimitiveValue::CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE eType, CFDE_CSSPrimitiveValue::CFDE_CSSPrimitiveValue(FDE_CSSPRIMITIVETYPE eType, const FX_WCHAR* pValue) : m_eType(eType), m_pString(pValue) { - ASSERT(m_pString != nullptr); + ASSERT(m_pString); } CFDE_CSSPrimitiveValue::CFDE_CSSPrimitiveValue(CFDE_CSSFunction* pFunction) diff --git a/xfa/fde/css/fde_cssstylesheet.cpp b/xfa/fde/css/fde_cssstylesheet.cpp index f0b071223f..87137c4259 100644 --- a/xfa/fde/css/fde_cssstylesheet.cpp +++ b/xfa/fde/css/fde_cssstylesheet.cpp @@ -377,7 +377,8 @@ FDE_CSSSYNTAXSTATUS CFDE_CSSStyleSheet::SkipRuleSet( } } -CFDE_CSSStyleRule::CFDE_CSSStyleRule() : m_ppSelector(NULL), m_iSelectors(0) {} +CFDE_CSSStyleRule::CFDE_CSSStyleRule() + : m_ppSelector(nullptr), m_iSelectors(0) {} int32_t CFDE_CSSStyleRule::CountSelectorLists() const { return m_iSelectors; diff --git a/xfa/fde/fde_gedevice.cpp b/xfa/fde/fde_gedevice.cpp index ba72e7d014..e78ab8da4c 100644 --- a/xfa/fde/fde_gedevice.cpp +++ b/xfa/fde/fde_gedevice.cpp @@ -126,9 +126,9 @@ FX_BOOL CFDE_RenderDevice::DrawString(CFDE_Brush* pBrush, } } FXTEXT_CHARPOS* pCP = (FXTEXT_CHARPOS*)pCharPos; - CFGAS_GEFont* pCurFont = NULL; - CFGAS_GEFont* pSTFont = NULL; - FXTEXT_CHARPOS* pCurCP = NULL; + CFGAS_GEFont* pCurFont = nullptr; + CFGAS_GEFont* pSTFont = nullptr; + FXTEXT_CHARPOS* pCurCP = nullptr; int32_t iCurCount = 0; #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ |