diff options
Diffstat (limited to 'xfa/fxfa/parser/cxfa_document.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_document.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/xfa/fxfa/parser/cxfa_document.cpp b/xfa/fxfa/parser/cxfa_document.cpp index 7723d0b5a7..d2c2da814d 100644 --- a/xfa/fxfa/parser/cxfa_document.cpp +++ b/xfa/fxfa/parser/cxfa_document.cpp @@ -334,7 +334,7 @@ CXFA_Node* CXFA_Document::GetNodeByID(CXFA_Node* pRoot, for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { WideStringView wsIDVal; - if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Id, wsIDVal) && + if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Id, wsIDVal, true) && !wsIDVal.IsEmpty()) { if (wsIDVal == wsID) return pNode; @@ -354,15 +354,16 @@ void CXFA_Document::DoProtoMerge() { for (CXFA_Node* pNode = sIterator.GetCurrent(); pNode; pNode = sIterator.MoveToNext()) { WideStringView wsIDVal; - if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Id, wsIDVal) && + if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Id, wsIDVal, true) && !wsIDVal.IsEmpty()) { mIDMap[FX_HashCode_GetW(wsIDVal, false)] = pNode; } WideStringView wsUseVal; - if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Use, wsUseVal) && + if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Use, wsUseVal, true) && !wsUseVal.IsEmpty()) { sUseNodes.insert(pNode); - } else if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Usehref, wsUseVal) && + } else if (pNode->JSNode()->TryCData(XFA_ATTRIBUTE_Usehref, wsUseVal, + true) && !wsUseVal.IsEmpty()) { sUseNodes.insert(pNode); } @@ -371,7 +372,8 @@ void CXFA_Document::DoProtoMerge() { for (CXFA_Node* pUseHrefNode : sUseNodes) { WideString wsUseVal; WideStringView wsURI, wsID, wsSOM; - if (pUseHrefNode->JSNode()->TryCData(XFA_ATTRIBUTE_Usehref, wsUseVal) && + if (pUseHrefNode->JSNode()->TryCData(XFA_ATTRIBUTE_Usehref, wsUseVal, + true) && !wsUseVal.IsEmpty()) { auto uSharpPos = wsUseVal.Find('#'); if (!uSharpPos.has_value()) { @@ -390,7 +392,8 @@ void CXFA_Document::DoProtoMerge() { uLen - uSharpPos.value() - 1); } } - } else if (pUseHrefNode->JSNode()->TryCData(XFA_ATTRIBUTE_Use, wsUseVal) && + } else if (pUseHrefNode->JSNode()->TryCData(XFA_ATTRIBUTE_Use, wsUseVal, + true) && !wsUseVal.IsEmpty()) { if (wsUseVal[0] == '#') wsID = WideStringView(wsUseVal.c_str() + 1, wsUseVal.GetLength() - 1); |