From 2614250d4f11ed02033a7da095a1694ece12ab78 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 13 Dec 2017 18:29:02 +0000 Subject: Methods are on CJX_Object not CJX_Node now This CL converts all of the JSNode() to JSObject() calls as all of the original CJX_Node methods have been moved to CJX_Object. This fixes potential bad casts from things like CJX_Content which do not inhert from CJX_Node. Bug: pdfium:793372 Change-Id: I6c7f63a78f3d47bb6bad74faed3fd8c535bf095e Reviewed-on: https://pdfium-review.googlesource.com/21090 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_paradata.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_paradata.cpp') diff --git a/xfa/fxfa/parser/cxfa_paradata.cpp b/xfa/fxfa/parser/cxfa_paradata.cpp index 22cb678c99..7dfd924675 100644 --- a/xfa/fxfa/parser/cxfa_paradata.cpp +++ b/xfa/fxfa/parser/cxfa_paradata.cpp @@ -12,49 +12,49 @@ CXFA_ParaData::CXFA_ParaData(CXFA_Node* pNode) : CXFA_DataData(pNode) {} XFA_AttributeEnum CXFA_ParaData::GetHorizontalAlign() const { - return m_pNode->JSNode() + return m_pNode->JSObject() ->TryEnum(XFA_Attribute::HAlign, true) .value_or(XFA_AttributeEnum::Left); } XFA_AttributeEnum CXFA_ParaData::GetVerticalAlign() const { - return m_pNode->JSNode() + return m_pNode->JSObject() ->TryEnum(XFA_Attribute::VAlign, true) .value_or(XFA_AttributeEnum::Top); } float CXFA_ParaData::GetLineHeight() const { - return m_pNode->JSNode() + return m_pNode->JSObject() ->GetMeasure(XFA_Attribute::LineHeight) .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetMarginLeft() const { - return m_pNode->JSNode() + return m_pNode->JSObject() ->GetMeasure(XFA_Attribute::MarginLeft) .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetMarginRight() const { - return m_pNode->JSNode() + return m_pNode->JSObject() ->GetMeasure(XFA_Attribute::MarginRight) .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetSpaceAbove() const { - return m_pNode->JSNode() + return m_pNode->JSObject() ->GetMeasure(XFA_Attribute::SpaceAbove) .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetSpaceBelow() const { - return m_pNode->JSNode() + return m_pNode->JSObject() ->GetMeasure(XFA_Attribute::SpaceBelow) .ToUnit(XFA_Unit::Pt); } float CXFA_ParaData::GetTextIndent() const { - return m_pNode->JSNode() + return m_pNode->JSObject() ->GetMeasure(XFA_Attribute::TextIndent) .ToUnit(XFA_Unit::Pt); } -- cgit v1.2.3