Index: xfa/fxfa/parser/xfa_parser_imp.cpp |
diff --git a/xfa/fxfa/parser/xfa_parser_imp.cpp b/xfa/fxfa/parser/xfa_parser_imp.cpp |
index efddc427a6045fb121096ee36773554338b4c01c..ff9dc35562c1c4943877681786511911e2105ffb 100644 |
--- a/xfa/fxfa/parser/xfa_parser_imp.cpp |
+++ b/xfa/fxfa/parser/xfa_parser_imp.cpp |
@@ -231,7 +231,7 @@ FX_BOOL XFA_FDEExtension_ResolveNamespaceQualifier( |
wsNamespaceURI.Empty(); |
return bRet; |
} |
-static inline void XFA_FDEExtension_GetElementTagNamespaceURI( |
+static inline void XFA_FDEExtension_GetObjectByTagNamespaceURI( |
dsinclair
2016/03/29 20:45:25
Do we want By here?
|
IFDE_XMLElement* pElement, |
CFX_WideString& wsNamespaceURI) { |
CFX_WideString wsNodeStr; |
@@ -255,7 +255,7 @@ static FX_BOOL XFA_FDEExtension_MatchNodeName( |
if (wsNodeStr != wsLocalTagName) { |
return FALSE; |
} |
- XFA_FDEExtension_GetElementTagNamespaceURI(pElement, wsNodeStr); |
+ XFA_FDEExtension_GetObjectByTagNamespaceURI(pElement, wsNodeStr); |
if (eMatchFlags & XFA_XDPPACKET_FLAGS_NOMATCH) { |
return TRUE; |
} |
@@ -830,7 +830,7 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode, |
IFDE_XMLElement* pXMLElement = (IFDE_XMLElement*)pXMLChild; |
CFX_WideString wsTagName; |
pXMLElement->GetLocalTagName(wsTagName); |
- const XFA_ELEMENTINFO* pElemInfo = XFA_GetElementByName(wsTagName); |
+ const XFA_ELEMENTINFO* pElemInfo = XFA_GetObjectByByName(wsTagName); |
if (!pElemInfo) { |
continue; |
} |
@@ -912,8 +912,8 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode, |
FX_BOOL XFA_RecognizeRichText(IFDE_XMLElement* pRichTextXMLNode) { |
if (pRichTextXMLNode) { |
CFX_WideString wsNamespaceURI; |
- XFA_FDEExtension_GetElementTagNamespaceURI(pRichTextXMLNode, |
- wsNamespaceURI); |
+ XFA_FDEExtension_GetObjectByTagNamespaceURI(pRichTextXMLNode, |
+ wsNamespaceURI); |
if (wsNamespaceURI == FX_WSTRC(L"http://www.w3.org/1999/xhtml")) { |
return TRUE; |
} |
@@ -1040,8 +1040,8 @@ void CXFA_SimpleParser::ParseDataGroup(CXFA_Node* pXFANode, |
IFDE_XMLElement* pXMLElement = (IFDE_XMLElement*)pXMLChild; |
{ |
CFX_WideString wsNamespaceURI; |
- XFA_FDEExtension_GetElementTagNamespaceURI(pXMLElement, |
- wsNamespaceURI); |
+ XFA_FDEExtension_GetObjectByTagNamespaceURI(pXMLElement, |
+ wsNamespaceURI); |
if (wsNamespaceURI == |
FX_WSTRC(L"http://www.xfa.com/schema/xfa-package/") || |
wsNamespaceURI == |