From dcbb8e53e604178dc97d12846ddbdef88be41297 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 14 Dec 2017 19:48:44 +0000 Subject: Fold CXFA_ValidateData into CXFA_Validate The ValidateData class is a thin wrapper around the Validate class. Now that the Validate class exists we can fold the methods from ValidateData into Validate. Change-Id: I1e72f4b7bddeb22a311f4fe9a5940204221b6d2a Reviewed-on: https://pdfium-review.googlesource.com/21150 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 fab11ce235..592226cb0b 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.h +++ b/xfa/fxfa/parser/cxfa_widgetdata.h @@ -22,7 +22,6 @@ #include "xfa/fxfa/parser/cxfa_fontdata.h" #include "xfa/fxfa/parser/cxfa_margindata.h" #include "xfa/fxfa/parser/cxfa_paradata.h" -#include "xfa/fxfa/parser/cxfa_validatedata.h" enum XFA_CHECKSTATE { XFA_CHECKSTATE_On = 0, @@ -38,6 +37,7 @@ enum XFA_VALUEPICTURE { }; class CXFA_Node; +class CXFA_Validate; class IFX_Locale; class CXFA_WidgetData : public CXFA_DataData { @@ -66,7 +66,7 @@ class CXFA_WidgetData : public CXFA_DataData { CXFA_ValueData GetDefaultValueData(); CXFA_ValueData GetFormValueData(); CXFA_CalculateData GetCalculateData(); - CXFA_ValidateData GetValidateData(bool bModified); + CXFA_Validate* GetValidate(bool bModified); CXFA_BorderData GetUIBorderData(); std::vector GetEventByActivity(XFA_AttributeEnum iActivity, -- cgit v1.2.3