From 948879d23226aea31aa9ae5f6eb1fb8572f0fc05 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 10 Jan 2018 19:43:56 +0000 Subject: Rename GetFont to GetFontIfExists This CL makes it explicit that GetFont may return nullptr. Change-Id: Icb7ec5ad4ed6c5f7a728230d1237898b8f2fd778 Reviewed-on: https://pdfium-review.googlesource.com/22673 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/cxfa_textprovider.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/cxfa_textprovider.cpp') diff --git a/xfa/fxfa/cxfa_textprovider.cpp b/xfa/fxfa/cxfa_textprovider.cpp index e3222a9c8b..6b4198ec1e 100644 --- a/xfa/fxfa/cxfa_textprovider.cpp +++ b/xfa/fxfa/cxfa_textprovider.cpp @@ -124,14 +124,14 @@ CXFA_Para* CXFA_TextProvider::GetPara() { return pNode->GetChild(0, XFA_Element::Para, false); } -CXFA_Font* CXFA_TextProvider::GetFont() { +CXFA_Font* CXFA_TextProvider::GetFontIfExists() { if (m_eType == XFA_TEXTPROVIDERTYPE_Text) - return m_pWidgetAcc->GetNode()->GetFont(); + return m_pWidgetAcc->GetNode()->GetFontIfExists(); CXFA_Caption* pNode = m_pWidgetAcc->GetNode()->GetChild( 0, XFA_Element::Caption, false); CXFA_Font* font = pNode->GetChild(0, XFA_Element::Font, false); - return font ? font : m_pWidgetAcc->GetNode()->GetFont(); + return font ? font : m_pWidgetAcc->GetNode()->GetFontIfExists(); } bool CXFA_TextProvider::IsCheckButtonAndAutoWidth() { -- cgit v1.2.3