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/parser/cxfa_widgetdata.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_widgetdata.h') diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h index c75225b5fe..30d64a09c5 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.h +++ b/xfa/fxfa/parser/cxfa_widgetdata.h @@ -15,7 +15,6 @@ #include "core/fxcrt/fx_system.h" #include "fxbarcode/BC_Library.h" #include "xfa/fxfa/parser/cxfa_datadata.h" -#include "xfa/fxfa/parser/cxfa_fontdata.h" enum XFA_CHECKSTATE { XFA_CHECKSTATE_On = 0, @@ -34,6 +33,7 @@ class CXFA_Bind; class CXFA_Border; class CXFA_Calculate; class CXFA_Caption; +class CXFA_Font; class CXFA_Margin; class CXFA_Node; class CXFA_Para; @@ -61,7 +61,7 @@ class CXFA_WidgetData : public CXFA_DataData { CXFA_Border* GetBorder(bool bModified); CXFA_Caption* GetCaption(); - CXFA_FontData GetFontData(bool bModified); + CXFA_Font* GetFont(bool bModified); CXFA_Margin* GetMargin(); CXFA_Para* GetPara(); CXFA_Value* GetDefaultValue(); -- cgit v1.2.3