From 39628b04bc86461426f2dcf5a568f5e9e70ad997 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 3 Jan 2018 12:01:24 -0500 Subject: Change CXFA_BoxData to CXFA_Box This CL renames CXFA_BoxData to CXFA_Box and sets it to inhert from CXFA_Node instead of CXFA_DataData. The CXFA_BoxData subclasses, CXFA_RectangleData, CXFA_BorderData and CXFA_ArcData classes are removed and the nodes now inherit from CXFA_Box. Change-Id: Ia0df7d56535b5d90be29f040180a5d5fc55a64e0 Reviewed-on: https://pdfium-review.googlesource.com/22091 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_widgetdata.h | 6 +++--- 1 file changed, 3 insertions(+), 3 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 e2dbfbfafd..d8dee8a2a3 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_binddata.h" -#include "xfa/fxfa/parser/cxfa_borderdata.h" #include "xfa/fxfa/parser/cxfa_captiondata.h" #include "xfa/fxfa/parser/cxfa_datadata.h" #include "xfa/fxfa/parser/cxfa_fontdata.h" @@ -33,6 +32,7 @@ enum XFA_VALUEPICTURE { XFA_VALUEPICTURE_DataBind, }; +class CXFA_Border; class CXFA_Calculate; class CXFA_Margin; class CXFA_Node; @@ -58,7 +58,7 @@ class CXFA_WidgetData : public CXFA_DataData { bool IsChoiceListAllowTextEntry(); bool IsMultiLine(); - CXFA_BorderData GetBorderData(bool bModified); + CXFA_Border* GetBorder(bool bModified); CXFA_CaptionData GetCaptionData(); CXFA_FontData GetFontData(bool bModified); CXFA_Margin* GetMargin(); @@ -67,7 +67,7 @@ class CXFA_WidgetData : public CXFA_DataData { CXFA_Value* GetFormValue(); CXFA_Calculate* GetCalculate(); CXFA_Validate* GetValidate(bool bModified); - CXFA_BorderData GetUIBorderData(); + CXFA_Border* GetUIBorder(); std::vector GetEventByActivity(XFA_AttributeEnum iActivity, bool bIsFormReady); -- cgit v1.2.3