From e83a915ebd3afaa897dbbf3e6cb3d2a2cb198595 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 3 Jan 2018 16:53:33 -0500 Subject: Fold CXFA_FontData into CXFA_Font This CL removes the CXFA_FontData wrapper and puts the functionality into CXFA_Font. Change-Id: Id7e3a71106816a05843a62645f5955a70f7eaeaa Reviewed-on: https://pdfium-review.googlesource.com/22113 Reviewed-by: Henrique Nakashima 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 461fa5dde4..b32241ea35 100644 --- a/xfa/fxfa/cxfa_textprovider.cpp +++ b/xfa/fxfa/cxfa_textprovider.cpp @@ -126,14 +126,14 @@ CXFA_Para* CXFA_TextProvider::GetPara() { return pNode->GetChild(0, XFA_Element::Para, false); } -CXFA_FontData CXFA_TextProvider::GetFontData() { +CXFA_Font* CXFA_TextProvider::GetFont() { if (m_eType == XFA_TEXTPROVIDERTYPE_Text) - return m_pWidgetAcc->GetFontData(false); + return m_pWidgetAcc->GetFont(false); CXFA_Caption* pNode = m_pWidgetAcc->GetNode()->GetChild( 0, XFA_Element::Caption, false); CXFA_Font* font = pNode->GetChild(0, XFA_Element::Font, false); - return font ? CXFA_FontData(font) : m_pWidgetAcc->GetFontData(false); + return font ? font : m_pWidgetAcc->GetFont(false); } bool CXFA_TextProvider::IsCheckButtonAndAutoWidth() { -- cgit v1.2.3