From cbd4410908e2a4898fdd5e0d6d17591fc2c71f54 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 3 Jan 2018 11:11:16 -0500 Subject: Fold CXFA_MarginData into CXFA_Margin This CL removes the CXFA_MarginData wrapper and moves the methods directly to CXFA_Margin. Change-Id: I7c9e979fb78d0d356605f1318489daabcb8c32cd Reviewed-on: https://pdfium-review.googlesource.com/22110 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_boxdata.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_boxdata.cpp') diff --git a/xfa/fxfa/parser/cxfa_boxdata.cpp b/xfa/fxfa/parser/cxfa_boxdata.cpp index 6e27c71e56..31fefbf93d 100644 --- a/xfa/fxfa/parser/cxfa_boxdata.cpp +++ b/xfa/fxfa/parser/cxfa_boxdata.cpp @@ -139,10 +139,9 @@ CXFA_FillData CXFA_BoxData::GetFillData(bool bModified) const { return CXFA_FillData(pFillNode); } -CXFA_MarginData CXFA_BoxData::GetMarginData() const { - return CXFA_MarginData( - m_pNode ? m_pNode->GetChild(0, XFA_Element::Margin, false) - : nullptr); +CXFA_Margin* CXFA_BoxData::GetMargin() const { + return m_pNode ? m_pNode->GetChild(0, XFA_Element::Margin, false) + : nullptr; } std::tuple CXFA_BoxData::Get3DStyle() const { -- cgit v1.2.3