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_valuedata.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_valuedata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_valuedata.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_valuedata.cpp b/xfa/fxfa/parser/cxfa_valuedata.cpp index a967b3b217..e44a76dbcc 100644 --- a/xfa/fxfa/parser/cxfa_valuedata.cpp +++ b/xfa/fxfa/parser/cxfa_valuedata.cpp @@ -19,9 +19,18 @@ XFA_Element CXFA_ValueData::GetChildValueClassID() { bool CXFA_ValueData::GetChildValueContent(WideString& wsContent) { if (!m_pNode) return false; - if (CXFA_Node* pNode = m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild)) - return pNode->JSNode()->TryContent(wsContent, false, true); - return false; + + CXFA_Node* pNode = m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild); + if (!pNode) + return false; + + pdfium::Optional<WideString> content = + pNode->JSNode()->TryContent(false, true); + if (!content) + return false; + + wsContent = *content; + return true; } CXFA_ArcData CXFA_ValueData::GetArcData() { |