diff options
| author | thestig <thestig@chromium.org> | 2016-06-07 10:46:22 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-07 10:46:23 -0700 |
| commit | 4997b22f84307521a62838f874928bf56cd3423c (patch) | |
| tree | ad11d99ac0a491ee222e9d0a42ec3b6ad3354e2a /xfa | |
| parent | 0687e76dc259c678b3f29a6608331f07ffd8f1e2 (diff) | |
| download | pdfium-4997b22f84307521a62838f874928bf56cd3423c.tar.xz | |
Get rid of NULLs in core/
Review-Url: https://codereview.chromium.org/2032613003
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fde/cfde_txtedtpage.cpp | 3 | ||||
| -rw-r--r-- | xfa/fwl/basewidget/fwl_datetimepickerimp.cpp | 5 | ||||
| -rw-r--r-- | xfa/fwl/core/fwl_widgetimp.cpp | 2 | ||||
| -rw-r--r-- | xfa/fwl/core/ifwl_widget.h | 2 | ||||
| -rw-r--r-- | xfa/fxfa/app/xfa_textlayout.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 2 |
6 files changed, 6 insertions, 12 deletions
diff --git a/xfa/fde/cfde_txtedtpage.cpp b/xfa/fde/cfde_txtedtpage.cpp index cecbf73b25..406b19b386 100644 --- a/xfa/fde/cfde_txtedtpage.cpp +++ b/xfa/fde/cfde_txtedtpage.cpp @@ -29,8 +29,7 @@ IFDE_TxtEdtPage* IFDE_TxtEdtPage::Create(CFDE_TxtEdtEngine* pEngine, } CFDE_TxtEdtPage::CFDE_TxtEdtPage(CFDE_TxtEdtEngine* pEngine, int32_t nPageIndex) - : m_pIter(nullptr), - m_pTextSet(nullptr), + : m_pTextSet(nullptr), m_pBgnParag(nullptr), m_pEndParag(nullptr), m_nRefCount(0), diff --git a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp b/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp index c6cef1c37d..6df6fb364e 100644 --- a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp @@ -426,10 +426,7 @@ CFWL_DateTimePickerImp::CFWL_DateTimePickerImp( m_iYear(-1), m_iMonth(-1), m_iDay(-1), - m_bLBtnDown(FALSE), - m_pEdit(nullptr), - m_pMonthCal(nullptr), - m_pForm(nullptr) { + m_bLBtnDown(FALSE) { m_rtBtn.Set(0, 0, 0, 0); } diff --git a/xfa/fwl/core/fwl_widgetimp.cpp b/xfa/fwl/core/fwl_widgetimp.cpp index 1c0d28379d..27f8a44c79 100644 --- a/xfa/fwl/core/fwl_widgetimp.cpp +++ b/xfa/fwl/core/fwl_widgetimp.cpp @@ -25,6 +25,8 @@ #define FWL_STYLEEXT_MNU_Vert (1L << 0) +IFWL_Widget::IFWL_Widget() {} + IFWL_Widget::~IFWL_Widget() {} FWL_Error IFWL_Widget::GetClassName(CFX_WideString& wsClass) const { diff --git a/xfa/fwl/core/ifwl_widget.h b/xfa/fwl/core/ifwl_widget.h index 0b864fee7d..90a484def2 100644 --- a/xfa/fwl/core/ifwl_widget.h +++ b/xfa/fwl/core/ifwl_widget.h @@ -59,7 +59,7 @@ class IFWL_WidgetDelegate; class IFWL_Widget { public: - IFWL_Widget() : m_pImpl(nullptr) {} + IFWL_Widget(); virtual ~IFWL_Widget(); FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp index 3c7497c660..c40e29c04b 100644 --- a/xfa/fxfa/app/xfa_textlayout.cpp +++ b/xfa/fxfa/app/xfa_textlayout.cpp @@ -652,12 +652,8 @@ CXFA_TextLayout::CXFA_TextLayout(CXFA_TextProvider* pTextProvider) m_pTextProvider(pTextProvider), m_pTextDataNode(nullptr), m_bRichText(FALSE), - m_pAllocator(nullptr), - m_pBreak(nullptr), - m_pLoader(nullptr), m_iLines(0), m_fMaxWidth(0), - m_pTabstopContext(nullptr), m_bBlockContinue(TRUE) { ASSERT(m_pTextProvider); } diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 33dcb475e7..5e64647788 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -1071,7 +1071,7 @@ int32_t CXFA_WidgetData::GetNumberOfCells() { CFX_WideString CXFA_WidgetData::GetBarcodeType() { CXFA_Node* pUIChild = GetUIChild(); return pUIChild ? CFX_WideString(pUIChild->GetCData(XFA_ATTRIBUTE_Type)) - : nullptr; + : CFX_WideString(); } FX_BOOL CXFA_WidgetData::GetBarcodeAttribute_CharEncoding(int32_t& val) { |