From 9d608ff14177cd665f6b2ead639415bda935fbe2 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 16 Nov 2017 14:17:17 +0000 Subject: Cleanup CJX_Node::GetAttribute This CL renames GetAttribute to TryAttribute and changes to return a pdfium::Optional instead of a boolean with an out parameter. GetAttribute is then added to call TryAttribute to mirror the other methods in the file. Change-Id: I875dac120776af7c53fe069e4dd36e5486838447 Reviewed-on: https://pdfium-review.googlesource.com/18514 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fxfa/parser/cxfa_imagedata.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'xfa/fxfa/parser/cxfa_imagedata.cpp') diff --git a/xfa/fxfa/parser/cxfa_imagedata.cpp b/xfa/fxfa/parser/cxfa_imagedata.cpp index 2ad891d7ec..7888c34205 100644 --- a/xfa/fxfa/parser/cxfa_imagedata.cpp +++ b/xfa/fxfa/parser/cxfa_imagedata.cpp @@ -35,7 +35,13 @@ bool CXFA_ImageData::GetHref(WideString& wsHref) { wsHref = *ret; return true; } - return m_pNode->JSNode()->GetAttribute(XFA_Attribute::Href, wsHref, true); + pdfium::Optional ret = + m_pNode->JSNode()->TryAttribute(XFA_Attribute::Href, true); + if (!ret) + return false; + + wsHref = *ret; + return true; } XFA_ATTRIBUTEENUM CXFA_ImageData::GetTransferEncoding() { -- cgit v1.2.3