Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(272)

Unified Diff: xfa/fxfa/parser/xfa_parser_imp.cpp

Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: String argument type Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « xfa/fxfa/parser/xfa_objectacc_imp.cpp ('k') | xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f4a479d7c33c75b3e0f0d01487a5cfac98de0d61..4c831d5b8fa5ee4a3a931ade8553044141ed6a76 100644
--- a/xfa/fxfa/parser/xfa_parser_imp.cpp
+++ b/xfa/fxfa/parser/xfa_parser_imp.cpp
@@ -225,8 +225,8 @@ static inline void XFA_FDEExtension_GetElementTagNamespaceURI(
CFX_WideString& wsNamespaceURI) {
CFX_WideString wsNodeStr;
pElement->GetNamespacePrefix(wsNodeStr);
- if (!XFA_FDEExtension_ResolveNamespaceQualifier(pElement, wsNodeStr,
- wsNamespaceURI)) {
+ if (!XFA_FDEExtension_ResolveNamespaceQualifier(
+ pElement, wsNodeStr.AsWideStringC(), wsNamespaceURI)) {
wsNamespaceURI.Empty();
}
}
@@ -283,8 +283,8 @@ static FX_BOOL XFA_FDEExtension_ResolveAttribute(
wsNSPrefix == FX_WSTRC(L"xmlns") || wsNSPrefix == FX_WSTRC(L"xml")) {
return FALSE;
}
- if (!XFA_FDEExtension_ResolveNamespaceQualifier(pElement, wsNSPrefix,
- wsNamespaceURI)) {
+ if (!XFA_FDEExtension_ResolveNamespaceQualifier(
+ pElement, wsNSPrefix.AsWideStringC(), wsNamespaceURI)) {
wsNamespaceURI.Empty();
return FALSE;
}
@@ -318,8 +318,8 @@ static FX_BOOL XFA_FDEExtension_FindAttributeWithNS(
}
wsNSPrefix = wsAttrName.Left(iFind);
}
- if (!XFA_FDEExtension_ResolveNamespaceQualifier(pElement, wsNSPrefix,
- wsAttrNS)) {
+ if (!XFA_FDEExtension_ResolveNamespaceQualifier(
+ pElement, wsNSPrefix.AsWideStringC(), wsAttrNS)) {
continue;
}
if (bMatchNSAsPrefix) {
@@ -433,7 +433,8 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_XDP(
reinterpret_cast<CFDE_XMLElement*>(pChildItem);
CFX_WideString wsPacketName;
pElement->GetLocalTagName(wsPacketName);
- const XFA_PACKETINFO* pPacketInfo = XFA_GetPacketByName(wsPacketName);
+ const XFA_PACKETINFO* pPacketInfo =
+ XFA_GetPacketByName(wsPacketName.AsWideStringC());
if (pPacketInfo && pPacketInfo->pURI) {
if (!XFA_FDEExtension_MatchNodeName(pElement, pPacketInfo->pName,
pPacketInfo->pURI,
@@ -585,7 +586,7 @@ CXFA_Node* CXFA_SimpleParser::ParseAsXDPPacket_TemplateForm(
}
pNode->SetCData(XFA_ATTRIBUTE_Name,
XFA_GetPacketByIndex(XFA_PACKET_Form)->pName);
- pNode->SetAttribute(XFA_ATTRIBUTE_Checksum, wsChecksum);
+ pNode->SetAttribute(XFA_ATTRIBUTE_Checksum, wsChecksum.AsWideStringC());
CXFA_Node* pTemplateRoot =
m_pRootNode->GetFirstChildByClass(XFA_ELEMENT_Template);
CXFA_Node* pTemplateChosen =
@@ -821,7 +822,8 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode,
CFDE_XMLElement* pXMLElement = static_cast<CFDE_XMLElement*>(pXMLChild);
CFX_WideString wsTagName;
pXMLElement->GetLocalTagName(wsTagName);
- const XFA_ELEMENTINFO* pElemInfo = XFA_GetElementByName(wsTagName);
+ const XFA_ELEMENTINFO* pElemInfo =
+ XFA_GetElementByName(wsTagName.AsWideStringC());
if (!pElemInfo) {
continue;
}
@@ -841,7 +843,8 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode,
return NULL;
}
if (ePacketID == XFA_XDPPACKET_Config) {
- pXFAChild->SetAttribute(XFA_ATTRIBUTE_Name, wsTagName);
+ pXFAChild->SetAttribute(XFA_ATTRIBUTE_Name,
+ wsTagName.AsWideStringC());
}
FX_BOOL IsNeedValue = TRUE;
for (int32_t i = 0, count = pXMLElement->CountAttributes(); i < count;
@@ -850,14 +853,14 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode,
CFX_WideString wsAttrName;
CFX_WideString wsAttrValue;
pXMLElement->GetAttribute(i, wsAttrQualifiedName, wsAttrValue);
- XFA_FDEExtension_GetAttributeLocalName(wsAttrQualifiedName,
- wsAttrName);
+ XFA_FDEExtension_GetAttributeLocalName(
+ wsAttrQualifiedName.AsWideStringC(), wsAttrName);
if (wsAttrName == FX_WSTRC(L"nil") &&
wsAttrValue == FX_WSTRC(L"true")) {
IsNeedValue = FALSE;
}
const XFA_ATTRIBUTEINFO* lpAttrInfo =
- XFA_GetAttributeByName(wsAttrName);
+ XFA_GetAttributeByName(wsAttrName.AsWideStringC());
if (!lpAttrInfo) {
continue;
}
@@ -865,7 +868,8 @@ CXFA_Node* CXFA_SimpleParser::NormalLoader(CXFA_Node* pXFANode,
lpAttrInfo->eName != XFA_ATTRIBUTE_Save) {
continue;
}
- pXFAChild->SetAttribute(lpAttrInfo->eName, wsAttrValue);
+ pXFAChild->SetAttribute(lpAttrInfo->eName,
+ wsAttrValue.AsWideStringC());
}
pXFANode->InsertChild(pXFAChild);
if (pElemInfo->eName == XFA_ELEMENT_Validate ||
@@ -1108,8 +1112,8 @@ void CXFA_SimpleParser::ParseDataGroup(CXFA_Node* pXFANode,
CFX_WideString wsAttrNamespaceURI;
pXMLElement->GetAttribute(i, wsAttrQualifiedName, wsAttrValue);
if (!XFA_FDEExtension_ResolveAttribute(
- pXMLElement, wsAttrQualifiedName, wsAttrName,
- wsAttrNamespaceURI)) {
+ pXMLElement, wsAttrQualifiedName.AsWideStringC(),
+ wsAttrName, wsAttrNamespaceURI)) {
continue;
}
if (wsAttrName == FX_WSTRC(L"nil") &&
« no previous file with comments | « xfa/fxfa/parser/xfa_objectacc_imp.cpp ('k') | xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698