From 382129e2bdb1337a5a82cbd96478aab02f9aff7d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 11 Jan 2018 14:11:41 +0000 Subject: Rename GetCalculate to GetCalculateIfExists This CL makes it explicit that GetCalculate can return nullptr. Change-Id: I587e3bb442df3661f083f7058ff02a8d62478ed5 Reviewed-on: https://pdfium-review.googlesource.com/22681 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_node.cpp | 4 ++-- xfa/fxfa/parser/cxfa_node.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/parser') diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp index 093d83a67d..74263c7643 100644 --- a/xfa/fxfa/parser/cxfa_node.cpp +++ b/xfa/fxfa/parser/cxfa_node.cpp @@ -1604,7 +1604,7 @@ CXFA_Value* CXFA_Node::GetFormValue() const { return JSObject()->GetProperty(0, XFA_Element::Value); } -CXFA_Calculate* CXFA_Node::GetCalculate() const { +CXFA_Calculate* CXFA_Node::GetCalculateIfExists() const { return JSObject()->GetProperty(0, XFA_Element::Calculate); } @@ -1697,7 +1697,7 @@ int32_t CXFA_Node::ProcessCalculate(CXFA_FFDocView* docView) { if (GetElementType() == XFA_Element::Draw) return XFA_EVENTERROR_NotExist; - CXFA_Calculate* calc = GetCalculate(); + CXFA_Calculate* calc = GetCalculateIfExists(); if (!calc) return XFA_EVENTERROR_NotExist; if (IsUserInteractive()) diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h index ed3b21d1e2..cafe6676fd 100644 --- a/xfa/fxfa/parser/cxfa_node.h +++ b/xfa/fxfa/parser/cxfa_node.h @@ -248,7 +248,7 @@ class CXFA_Node : public CXFA_Object { CXFA_Margin* GetMarginIfExists() const; CXFA_Para* GetParaIfExists() const; - CXFA_Calculate* GetCalculate() const; + CXFA_Calculate* GetCalculateIfExists() const; CXFA_Validate* GetValidate() const; CXFA_Validate* GetOrCreateValidate(); -- cgit v1.2.3