Index: xfa/fxfa/app/xfa_textlayout.cpp |
diff --git a/xfa/fxfa/app/xfa_textlayout.cpp b/xfa/fxfa/app/xfa_textlayout.cpp |
index 07a353e28710fbf538637f0d84080be8e8a09cea..4cbdfd4f8ec0569434ef94fb326dff505dd7b7f4 100644 |
--- a/xfa/fxfa/app/xfa_textlayout.cpp |
+++ b/xfa/fxfa/app/xfa_textlayout.cpp |
@@ -308,7 +308,7 @@ void CXFA_TextParser::ParseTagInfo(CFDE_XMLNode* pXMLNode, |
tagProvider.m_bTagAviliable = |
lookup.Lookup(dwHashCode, s_XFATagName, s_iCount) > -1; |
CFX_WideString wsValue; |
- pXMLElement->GetString(FX_WSTRC(L"style").GetPtr(), wsValue); |
+ pXMLElement->GetString(FX_WSTRC(L"style").raw_str(), wsValue); |
if (!wsValue.IsEmpty()) { |
tagProvider.SetAttribute(FX_WSTRC(L"style"), wsValue); |
} |
@@ -527,7 +527,7 @@ FX_BOOL CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider, |
if (pXMLNode->GetType() == FDE_XMLNODE_Element) { |
CFDE_XMLElement* pElement = static_cast<CFDE_XMLElement*>(pXMLNode); |
CFX_WideString wsAttr; |
- pElement->GetString(FX_WSTRC(L"xfa:embed").GetPtr(), wsAttr); |
+ pElement->GetString(FX_WSTRC(L"xfa:embed").raw_str(), wsAttr); |
if (wsAttr.IsEmpty()) { |
return FALSE; |
} |
@@ -535,7 +535,7 @@ FX_BOOL CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider, |
wsAttr.Delete(0); |
} |
CFX_WideString ws; |
- pElement->GetString(FX_WSTRC(L"xfa:embedType").GetPtr(), ws); |
+ pElement->GetString(FX_WSTRC(L"xfa:embedType").raw_str(), ws); |
if (ws.IsEmpty()) { |
ws = L"som"; |
} else { |
@@ -546,7 +546,7 @@ FX_BOOL CXFA_TextParser::GetEmbbedObj(CXFA_TextProvider* pTextProvider, |
return FALSE; |
} |
ws.Empty(); |
- pElement->GetString(FX_WSTRC(L"xfa:embedMode").GetPtr(), ws); |
+ pElement->GetString(FX_WSTRC(L"xfa:embedMode").raw_str(), ws); |
if (ws.IsEmpty()) { |
ws = L"formatted"; |
} else { |
@@ -1425,7 +1425,7 @@ FX_BOOL CXFA_TextLayout::LoadRichText(CFDE_XMLNode* pXMLNode, |
if (wsName == FX_WSTRC(L"a")) { |
CFX_WideString wsLinkContent; |
FXSYS_assert(pElement); |
- pElement->GetString(FX_WSTRC(L"href").GetPtr(), wsLinkContent); |
+ pElement->GetString(FX_WSTRC(L"href").raw_str(), wsLinkContent); |
if (!wsLinkContent.IsEmpty()) { |
pLinkData = FXTARGET_NewWith(m_pAllocator) CXFA_LinkUserData( |
m_pAllocator, |