diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-16 13:42:49 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-16 13:42:49 +0000 |
| commit | b066704a22ba4f242567f508c12bf2545cbed9e1 (patch) | |
| tree | b0ef12e2873bf7018d4b17a41b626428fb789923 /xfa/fxfa/parser/cxfa_binddata.cpp | |
| parent | 4011677aed8b258fcf87cf52b0d541ef04c832ff (diff) | |
| download | pdfium-b066704a22ba4f242567f508c12bf2545cbed9e1.tar.xz | |
Convert TryCData and TryContent to optionals
This CL changes the TryCData and TryContent to return
pdfium::Optional<WideString> values instead of returning a bool and
taking an out WideString.
Change-Id: I9c9d877803f9f1977191e12d6a907c29784c10b2
Reviewed-on: https://pdfium-review.googlesource.com/18510
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_binddata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_binddata.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/cxfa_binddata.cpp b/xfa/fxfa/parser/cxfa_binddata.cpp index c47e6534d9..79f375fa6a 100644 --- a/xfa/fxfa/parser/cxfa_binddata.cpp +++ b/xfa/fxfa/parser/cxfa_binddata.cpp @@ -11,6 +11,8 @@ CXFA_BindData::CXFA_BindData(CXFA_Node* pNode) : CXFA_DataData(pNode) {} void CXFA_BindData::GetPicture(WideString& wsPicture) { - if (CXFA_Node* pPicture = m_pNode->GetChild(0, XFA_Element::Picture, false)) - pPicture->JSNode()->TryContent(wsPicture, false, true); + CXFA_Node* pPicture = m_pNode->GetChild(0, XFA_Element::Picture, false); + if (!pPicture) + return; + wsPicture = pPicture->JSNode()->GetContent(false); } |