From 9647614a5dcd00d50aacf4e000fd23a5ebb13931 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 3 Jan 2018 11:25:05 -0500 Subject: Fold CXFA_OccurData into CXFA_Occur This CL folds the CXFA_OccurData wrapper into CXFA_Occur. Change-Id: I52e237e4f6b76f6915c397e924037562fd9eda6a Reviewed-on: https://pdfium-review.googlesource.com/22130 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fxjs/xfa/cjx_occur.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'fxjs/xfa/cjx_occur.cpp') diff --git a/fxjs/xfa/cjx_occur.cpp b/fxjs/xfa/cjx_occur.cpp index f5540c0c7a..f57cd96cb5 100644 --- a/fxjs/xfa/cjx_occur.cpp +++ b/fxjs/xfa/cjx_occur.cpp @@ -10,7 +10,6 @@ #include "fxjs/cfxjse_value.h" #include "xfa/fxfa/parser/cxfa_occur.h" -#include "xfa/fxfa/parser/cxfa_occurdata.h" CJX_Occur::CJX_Occur(CXFA_Occur* node) : CJX_Node(node) {} @@ -19,23 +18,23 @@ CJX_Occur::~CJX_Occur() = default; void CJX_Occur::max(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute) { - CXFA_OccurData occurData(GetXFANode()); + CXFA_Occur* occur = static_cast(GetXFANode()); if (!bSetting) { - pValue->SetInteger(occurData.GetMax()); + pValue->SetInteger(occur->GetMax()); return; } - occurData.SetMax(pValue->ToInteger()); + occur->SetMax(pValue->ToInteger()); } void CJX_Occur::min(CFXJSE_Value* pValue, bool bSetting, XFA_Attribute eAttribute) { - CXFA_OccurData occurData(GetXFANode()); + CXFA_Occur* occur = static_cast(GetXFANode()); if (!bSetting) { - pValue->SetInteger(occurData.GetMin()); + pValue->SetInteger(occur->GetMin()); return; } - occurData.SetMin(pValue->ToInteger()); + occur->SetMin(pValue->ToInteger()); } void CJX_Occur::use(CFXJSE_Value* pValue, -- cgit v1.2.3