diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-14 21:19:44 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-14 21:19:44 +0000 |
commit | aee28693976cc246eea8230a999906802e52cab7 (patch) | |
tree | 612e6dbc9b79c978208a623138f70f881acb539f /xfa/fxfa/parser/cxfa_document.cpp | |
parent | 5a423ef8708e61d43f1556ab09c2e09f496d700d (diff) | |
download | pdfium-aee28693976cc246eea8230a999906802e52cab7.tar.xz |
Cleanup XFA default value code
This CL adds helper methods to CXFA_Node to retrieve the default values
for attributes with the correct data types.
Change-Id: I644435b4b430819f1060a95fa4fffe4ba2826cfe
Reviewed-on: https://pdfium-review.googlesource.com/18450
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_document.cpp')
-rw-r--r-- | xfa/fxfa/parser/cxfa_document.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index c374b762ba..f5a72bde9a 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -333,7 +333,7 @@ CXFA_Node* CXFA_Document::GetNodeByID(CXFA_Node* pRoot, CXFA_NodeIterator sIterator(pRoot); for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { - WideStringView wsIDVal; + WideString wsIDVal; if (pNode->JSNode()->TryCData(XFA_Attribute::Id, wsIDVal, true) && !wsIDVal.IsEmpty()) { if (wsIDVal == wsID) @@ -353,12 +353,12 @@ void CXFA_Document::DoProtoMerge() { CXFA_NodeIterator sIterator(pTemplateRoot); for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { - WideStringView wsIDVal; + WideString wsIDVal; if (pNode->JSNode()->TryCData(XFA_Attribute::Id, wsIDVal, true) && !wsIDVal.IsEmpty()) { - mIDMap[FX_HashCode_GetW(wsIDVal, false)] = pNode; + mIDMap[FX_HashCode_GetW(wsIDVal.AsStringView(), false)] = pNode; } - WideStringView wsUseVal; + WideString wsUseVal; if (pNode->JSNode()->TryCData(XFA_Attribute::Use, wsUseVal, true) && !wsUseVal.IsEmpty()) { sUseNodes.insert(pNode); |