| Index: xfa/fwl/theme/cfwl_widgettp.cpp
|
| diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
|
| index 867e908a0e8926f9a72399e87235f296eaff7d55..3ef9b0ba2d5e7598ae0c51abcf350e37939fad4a 100644
|
| --- a/xfa/fwl/theme/cfwl_widgettp.cpp
|
| +++ b/xfa/fwl/theme/cfwl_widgettp.cpp
|
| @@ -150,7 +150,7 @@ void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart* pThemePart,
|
| m_rtMargin.Set(0, 0, 0, 0);
|
| return &m_rtMargin;
|
| }
|
| - default: { return NULL; }
|
| + default: { return nullptr; }
|
| }
|
| return &m_fValue;
|
| }
|
| @@ -665,17 +665,17 @@ void CFWL_WidgetTP::DrawArrowBtn(CFX_Graphics* pGraphics,
|
| CFWL_ArrowData::GetInstance()->m_pColorData;
|
| DrawArrow(pGraphics, pRect, eDict, pColorData->clrSign[eState - 1], pMatrix);
|
| }
|
| -CFWL_ArrowData::CFWL_ArrowData() : m_pColorData(NULL) {
|
| +CFWL_ArrowData::CFWL_ArrowData() : m_pColorData(nullptr) {
|
| SetColorData(0);
|
| }
|
| CFWL_FontData::CFWL_FontData()
|
| : m_dwStyles(0),
|
| m_dwCodePage(0),
|
| m_pFont(0),
|
| - m_pFontMgr(NULL)
|
| + m_pFontMgr(nullptr)
|
| #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
|
| ,
|
| - m_pFontSource(NULL)
|
| + m_pFontSource(nullptr)
|
| #endif
|
| {
|
| }
|
| @@ -687,7 +687,7 @@ CFWL_FontData::~CFWL_FontData() {
|
| m_pFontMgr->Release();
|
| }
|
| #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
|
| - if (m_pFontSource != NULL) {
|
| + if (m_pFontSource) {
|
| m_pFontSource->Release();
|
| }
|
| #endif
|
| @@ -714,7 +714,7 @@ FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
|
| }
|
| m_pFont = CFGAS_GEFont::LoadFont(wsFontFamily.c_str(), dwFontStyles,
|
| dwCodePage, m_pFontMgr);
|
| - return m_pFont != NULL;
|
| + return !!m_pFont;
|
| }
|
|
|
| CFWL_FontManager* CFWL_FontManager::s_FontManager = nullptr;
|
| @@ -756,7 +756,7 @@ uint32_t FWL_GetThemeColor(uint32_t dwThemeID) {
|
| return 0x0000ffff & dwThemeID;
|
| }
|
|
|
| -CFWL_ArrowData* CFWL_ArrowData::m_pInstance = NULL;
|
| +CFWL_ArrowData* CFWL_ArrowData::m_pInstance = nullptr;
|
|
|
| CFWL_ArrowData* CFWL_ArrowData::GetInstance() {
|
| if (!m_pInstance)
|
|
|