From 4997b22f84307521a62838f874928bf56cd3423c Mon Sep 17 00:00:00 2001 From: thestig Date: Tue, 7 Jun 2016 10:46:22 -0700 Subject: Get rid of NULLs in core/ Review-Url: https://codereview.chromium.org/2032613003 --- xfa/fxfa/app/xfa_textlayout.cpp | 4 ---- xfa/fxfa/parser/cxfa_widgetdata.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'xfa/fxfa') 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) { -- cgit v1.2.3