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_value.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_value.cpp') diff --git a/xfa/fxfa/parser/cxfa_value.cpp b/xfa/fxfa/parser/cxfa_value.cpp index d4911c56db..d2c92067af 100644 --- a/xfa/fxfa/parser/cxfa_value.cpp +++ b/xfa/fxfa/parser/cxfa_value.cpp @@ -8,6 +8,8 @@ #include "fxjs/xfa/cjx_value.h" #include "third_party/base/ptr_util.h" +#include "xfa/fxfa/parser/cxfa_arc.h" +#include "xfa/fxfa/parser/cxfa_rectangle.h" namespace { @@ -63,16 +65,16 @@ WideString CXFA_Value::GetChildValueContent() const { return pNode->JSObject()->TryContent(false, true).value_or(L""); } -CXFA_ArcData CXFA_Value::GetArcData() const { - return CXFA_ArcData(GetNodeItem(XFA_NODEITEM_FirstChild)); +CXFA_Arc* CXFA_Value::GetArc() const { + return static_cast(GetNodeItem(XFA_NODEITEM_FirstChild)); } CXFA_LineData CXFA_Value::GetLineData() const { return CXFA_LineData(GetNodeItem(XFA_NODEITEM_FirstChild)); } -CXFA_RectangleData CXFA_Value::GetRectangleData() const { - return CXFA_RectangleData(GetNodeItem(XFA_NODEITEM_FirstChild)); +CXFA_Rectangle* CXFA_Value::GetRectangle() const { + return static_cast(GetNodeItem(XFA_NODEITEM_FirstChild)); } CXFA_Text* CXFA_Value::GetText() const { -- cgit v1.2.3