Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Unified Diff: xfa/fxfa/app/xfa_fwltheme.cpp

Issue 2031873003: Get rid of NULLs in xfa/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@nullptr_fpdfsdk
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fxfa/app/xfa_fontmgr.cpp ('k') | xfa/fxfa/app/xfa_textlayout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/app/xfa_fwltheme.cpp
diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp
index 0c8e346066760dc4c31a198db82707d84f18177a..5ab4c4e9f5e751b667cd81b1dd87405ad18fadaa 100644
--- a/xfa/fxfa/app/xfa_fwltheme.cpp
+++ b/xfa/fxfa/app/xfa_fwltheme.cpp
@@ -45,7 +45,7 @@ CXFA_FFWidget* XFA_ThemeGetOuterWidget(IFWL_Widget* pWidget) {
CXFA_FWLTheme::CXFA_FWLTheme(CXFA_FFApp* pApp) : m_pApp(pApp) {
m_dwCapacity = 0;
m_fCapacity = 0;
- m_pCalendarFont = NULL;
+ m_pCalendarFont = nullptr;
m_Rect.Set(0, 0, 0, 0);
m_pCheckBoxTP = new CXFA_FWLCheckBoxTP;
m_pListBoxTP = new CFWL_ListBoxTP;
@@ -84,14 +84,14 @@ FWL_Error CXFA_FWLTheme::Initialize() {
if (!m_pCalendarFont) {
#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
m_pCalendarFont = m_pApp->GetFDEFontMgr()->GetDefFontByCodePage(
- FX_CODEPAGE_MSWin_WesternEuropean, 0, NULL);
+ FX_CODEPAGE_MSWin_WesternEuropean, 0, nullptr);
#else
m_pCalendarFont = m_pApp->GetFDEFontMgr()->GetFontByCodePage(
- FX_CODEPAGE_MSWin_WesternEuropean, 0, NULL);
+ FX_CODEPAGE_MSWin_WesternEuropean, 0, nullptr);
#endif
}
- ASSERT(NULL != m_pCalendarFont);
+ ASSERT(m_pCalendarFont);
FWLTHEME_Init();
return FWL_Error::Succeeded;
}
@@ -235,11 +235,11 @@ void* CXFA_FWLTheme::GetCapacity(CFWL_ThemePart* pThemePart,
m_Rect.width += para.GetMarginRight();
}
}
- if (pItem->GetPrev() == NULL) {
+ if (!pItem->GetPrev()) {
if (pItem->GetNext()) {
m_Rect.height = 0;
}
- } else if (pItem->GetNext() == NULL) {
+ } else if (!pItem->GetNext()) {
m_Rect.top = 0;
} else {
m_Rect.top = 0;
« no previous file with comments | « xfa/fxfa/app/xfa_fontmgr.cpp ('k') | xfa/fxfa/app/xfa_textlayout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698