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_scriptdata.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_scriptdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_scriptdata.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/cxfa_scriptdata.cpp b/xfa/fxfa/parser/cxfa_scriptdata.cpp index f7352be79c..39d9a4b8c9 100644 --- a/xfa/fxfa/parser/cxfa_scriptdata.cpp +++ b/xfa/fxfa/parser/cxfa_scriptdata.cpp @@ -11,12 +11,13 @@ CXFA_ScriptData::CXFA_ScriptData(CXFA_Node* pNode) : CXFA_DataData(pNode) {} XFA_ScriptDataType CXFA_ScriptData::GetContentType() { - WideString cData; - if (!m_pNode->JSNode()->TryCData(XFA_Attribute::ContentType, cData, false)) + pdfium::Optional<WideString> cData = + m_pNode->JSNode()->TryCData(XFA_Attribute::ContentType, false); + if (!cData) return XFA_ScriptDataType::Formcalc; - if (cData == L"application/x-javascript") + if (*cData == L"application/x-javascript") return XFA_ScriptDataType::Javascript; - if (cData == L"application/x-formcalc") + if (*cData == L"application/x-formcalc") return XFA_ScriptDataType::Formcalc; return XFA_ScriptDataType::Unknown; } @@ -26,5 +27,5 @@ int32_t CXFA_ScriptData::GetRunAt() { } void CXFA_ScriptData::GetExpression(WideString& wsExpression) { - m_pNode->JSNode()->TryContent(wsExpression, false, true); + wsExpression = m_pNode->JSNode()->GetContent(false); } |