summaryrefslogtreecommitdiff
path: root/xfa/fxfa/parser
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fxfa/parser')
-rw-r--r--xfa/fxfa/parser/xfa_basic_imp.cpp15
-rw-r--r--xfa/fxfa/parser/xfa_document_datamerger_imp.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_document_imp.cpp6
-rw-r--r--xfa/fxfa/parser/xfa_document_serialize.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_layout_itemlayout.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_object_imp.cpp22
-rw-r--r--xfa/fxfa/parser/xfa_objectacc_imp.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp2
-rw-r--r--xfa/fxfa/parser/xfa_script_imp.cpp4
-rw-r--r--xfa/fxfa/parser/xfa_script_resolveprocessor.cpp2
10 files changed, 32 insertions, 33 deletions
diff --git a/xfa/fxfa/parser/xfa_basic_imp.cpp b/xfa/fxfa/parser/xfa_basic_imp.cpp
index 13c879a31e..07f1b82301 100644
--- a/xfa/fxfa/parser/xfa_basic_imp.cpp
+++ b/xfa/fxfa/parser/xfa_basic_imp.cpp
@@ -26,7 +26,7 @@ const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName) {
if (iLength == 0) {
return NULL;
}
- uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength);
+ uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength);
int32_t iStart = 0, iEnd = g_iXFAPacketCount - 1;
do {
int32_t iMid = (iStart + iEnd) / 2;
@@ -68,7 +68,7 @@ const XFA_ATTRIBUTEENUMINFO* XFA_GetAttributeEnumByName(
if (iLength == 0) {
return NULL;
}
- uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength);
+ uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength);
int32_t iStart = 0, iEnd = g_iXFAEnumCount - 1;
do {
int32_t iMid = (iStart + iEnd) / 2;
@@ -94,7 +94,7 @@ const XFA_ATTRIBUTEINFO* XFA_GetAttributeByName(const CFX_WideStringC& wsName) {
if (iLength == 0) {
return NULL;
}
- uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength);
+ uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength);
int32_t iStart = 0, iEnd = g_iXFAAttributeCount - 1;
do {
int32_t iMid = (iStart + iEnd) / 2;
@@ -195,7 +195,7 @@ const XFA_ELEMENTINFO* XFA_GetElementByName(const CFX_WideStringC& wsName) {
if (iLength == 0) {
return NULL;
}
- uint32_t uHash = FX_HashCode_String_GetW(wsName.raw_str(), iLength);
+ uint32_t uHash = FX_HashCode_String_GetW(wsName.c_str(), iLength);
int32_t iStart = 0, iEnd = g_iXFAElementCount - 1;
do {
int32_t iMid = (iStart + iEnd) / 2;
@@ -380,7 +380,7 @@ const XFA_METHODINFO* XFA_GetMethodByName(XFA_ELEMENT eElement,
iElementIndex = scriptIndex->wParentIndex;
continue;
}
- uint32_t uHash = FX_HashCode_String_GetW(wsMethodName.raw_str(), iLength);
+ uint32_t uHash = FX_HashCode_String_GetW(wsMethodName.c_str(), iLength);
int32_t iStart = scriptIndex->wMethodStart, iEnd = iStart + icount - 1;
do {
int32_t iMid = (iStart + iEnd) / 2;
@@ -412,8 +412,7 @@ const XFA_SCRIPTATTRIBUTEINFO* XFA_GetScriptAttributeByName(
iElementIndex = scriptIndex->wParentIndex;
continue;
}
- uint32_t uHash =
- FX_HashCode_String_GetW(wsAttributeName.raw_str(), iLength);
+ uint32_t uHash = FX_HashCode_String_GetW(wsAttributeName.c_str(), iLength);
int32_t iStart = scriptIndex->wAttributeStart, iEnd = iStart + icount - 1;
do {
int32_t iMid = (iStart + iEnd) / 2;
@@ -438,7 +437,7 @@ void CXFA_Measurement::Set(const CFX_WideStringC& wsMeasure) {
}
int32_t iUsedLen = 0;
int32_t iOffset = (wsMeasure.GetAt(0) == L'=') ? 1 : 0;
- FX_FLOAT fValue = FX_wcstof(wsMeasure.raw_str() + iOffset,
+ FX_FLOAT fValue = FX_wcstof(wsMeasure.c_str() + iOffset,
wsMeasure.GetLength() - iOffset, &iUsedLen);
XFA_UNIT eUnit = GetUnit(wsMeasure.Mid(iOffset + iUsedLen));
Set(fValue, eUnit);
diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index a28b4994ab..2217b94a3b 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -404,7 +404,7 @@ static CXFA_Node* XFA_DataMerge_FindGlobalDataNode(CXFA_Document* pDocument,
CXFA_Node* pDataScope,
XFA_ELEMENT eMatchNodeType) {
uint32_t dwNameHash =
- wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+ wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
wsName.GetLength());
if (dwNameHash != 0) {
CXFA_Node* pBounded = XFA_DataMerge_GetGlobalBinding(pDocument, dwNameHash);
@@ -424,7 +424,7 @@ static CXFA_Node* XFA_DataMerge_FindOnceDataNode(CXFA_Document* pDocument,
CXFA_Node* pDataScope,
XFA_ELEMENT eMatchNodeType) {
uint32_t dwNameHash =
- wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+ wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
wsName.GetLength());
if (dwNameHash != 0) {
for (CXFA_Node *pCurDataScope = pDataScope, *pLastDataScope = NULL;
diff --git a/xfa/fxfa/parser/xfa_document_imp.cpp b/xfa/fxfa/parser/xfa_document_imp.cpp
index bb2001e803..9bdee05a55 100644
--- a/xfa/fxfa/parser/xfa_document_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_imp.cpp
@@ -96,7 +96,7 @@ CXFA_FFNotify* CXFA_Document::GetNotify() const {
}
CXFA_Object* CXFA_Document::GetXFAObject(const CFX_WideStringC& wsNodeName) {
return GetXFAObject(
- FX_HashCode_String_GetW(wsNodeName.raw_str(), wsNodeName.GetLength()));
+ FX_HashCode_String_GetW(wsNodeName.c_str(), wsNodeName.GetLength()));
}
CXFA_Object* CXFA_Document::GetXFAObject(uint32_t dwNodeNameHash) {
switch (dwNodeNameHash) {
@@ -367,7 +367,7 @@ void CXFA_Document::DoProtoMerge() {
pNode = sIterator.MoveToNext()) {
CFX_WideStringC wsIDVal;
if (pNode->TryCData(XFA_ATTRIBUTE_Id, wsIDVal) && !wsIDVal.IsEmpty()) {
- mIDMap[FX_HashCode_String_GetW(wsIDVal.raw_str(), wsIDVal.GetLength())] =
+ mIDMap[FX_HashCode_String_GetW(wsIDVal.c_str(), wsIDVal.GetLength())] =
pNode;
}
CFX_WideStringC wsUseVal;
@@ -429,7 +429,7 @@ void CXFA_Document::DoProtoMerge() {
}
} else if (!wsID.IsEmpty()) {
if (!mIDMap.Lookup(
- FX_HashCode_String_GetW(wsID.raw_str(), wsID.GetLength()),
+ FX_HashCode_String_GetW(wsID.c_str(), wsID.GetLength()),
pProtoNode)) {
continue;
}
diff --git a/xfa/fxfa/parser/xfa_document_serialize.cpp b/xfa/fxfa/parser/xfa_document_serialize.cpp
index 39590f6e8f..516a947ffb 100644
--- a/xfa/fxfa/parser/xfa_document_serialize.cpp
+++ b/xfa/fxfa/parser/xfa_document_serialize.cpp
@@ -389,7 +389,7 @@ static void XFA_DataExporter_RegenerateFormFile_Container(
CFX_WideStringC wsElement;
pNode->GetClassName(wsElement);
pStream->WriteString(L"<", 1);
- pStream->WriteString(wsElement.raw_str(), wsElement.GetLength());
+ pStream->WriteString(wsElement.c_str(), wsElement.GetLength());
CFX_WideString wsOutput;
XFA_SaveAttribute(pNode, XFA_ATTRIBUTE_Name, FX_WSTRC(L"name"), TRUE,
wsOutput);
@@ -418,7 +418,7 @@ static void XFA_DataExporter_RegenerateFormFile_Container(
pChildNode = pChildNode->GetNodeItem(XFA_NODEITEM_NextSibling);
}
pStream->WriteString(L"</", 2);
- pStream->WriteString(wsElement.raw_str(), wsElement.GetLength());
+ pStream->WriteString(wsElement.c_str(), wsElement.GetLength());
pStream->WriteString(L"\n>", 2);
} else {
pStream->WriteString(L"\n/>", 3);
diff --git a/xfa/fxfa/parser/xfa_layout_itemlayout.cpp b/xfa/fxfa/parser/xfa_layout_itemlayout.cpp
index d69bf2506c..8278ce990d 100644
--- a/xfa/fxfa/parser/xfa_layout_itemlayout.cpp
+++ b/xfa/fxfa/parser/xfa_layout_itemlayout.cpp
@@ -1380,7 +1380,7 @@ void CXFA_ItemLayoutProcessor::DoLayoutTableContainer(CXFA_Node* pLayoutNode) {
CFX_WideStringC wsColumnWidths;
if (pLayoutNode->TryCData(XFA_ATTRIBUTE_ColumnWidths, wsColumnWidths)) {
CFX_WideStringArray widths;
- if (FX_SeparateStringW(wsColumnWidths.raw_str(), wsColumnWidths.GetLength(),
+ if (FX_SeparateStringW(wsColumnWidths.c_str(), wsColumnWidths.GetLength(),
L' ', widths) > 0) {
int32_t iCols = widths.GetSize();
CFX_WideString wsWidth;
diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index 1dd526571d..8be5746960 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -56,7 +56,7 @@ void CXFA_Object::Script_ObjectClass_ClassName(FXJSE_HVALUE hValue,
CFX_WideStringC className;
GetClassName(className);
FXJSE_Value_SetUTF8String(
- hValue, FX_UTF8Encode(className.raw_str(), className.GetLength())
+ hValue, FX_UTF8Encode(className.c_str(), className.GetLength())
.AsByteStringC());
} else {
ThrowScriptErrorMessage(XFA_IDS_INVAlID_PROP_SET);
@@ -1799,7 +1799,7 @@ static const XFA_ExecEventParaInfo gs_eventParaInfos[] = {
const XFA_ExecEventParaInfo* GetEventParaInfoByName(
const CFX_WideStringC& wsEventName) {
int32_t iLength = wsEventName.GetLength();
- uint32_t uHash = FX_HashCode_String_GetW(wsEventName.raw_str(), iLength);
+ uint32_t uHash = FX_HashCode_String_GetW(wsEventName.c_str(), iLength);
const XFA_ExecEventParaInfo* eventParaInfo = NULL;
int32_t iStart = 0,
iEnd = (sizeof(gs_eventParaInfos) / sizeof(gs_eventParaInfos[0])) - 1;
@@ -3769,7 +3769,7 @@ enum XFA_KEYTYPE {
XFA_KEYTYPE_Element,
};
void* XFA_GetMapKey_Custom(const CFX_WideStringC& wsKey) {
- uint32_t dwKey = FX_HashCode_String_GetW(wsKey.raw_str(), wsKey.GetLength());
+ uint32_t dwKey = FX_HashCode_String_GetW(wsKey.c_str(), wsKey.GetLength());
return (void*)(uintptr_t)((dwKey << 1) | XFA_KEYTYPE_Custom);
}
void* XFA_GetMapKey_Element(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute) {
@@ -3808,7 +3808,7 @@ FX_BOOL CXFA_Node::SetAttribute(XFA_ATTRIBUTE eAttr,
case XFA_ATTRIBUTETYPE_Integer:
return SetInteger(
pAttr->eName,
- FXSYS_round(FX_wcstof(wsValue.raw_str(), wsValue.GetLength())),
+ FXSYS_round(FX_wcstof(wsValue.c_str(), wsValue.GetLength())),
bNotify);
case XFA_ATTRIBUTETYPE_Measure:
return SetMeasure(pAttr->eName, CXFA_Measurement(wsValue), bNotify);
@@ -4751,7 +4751,7 @@ FX_BOOL CXFA_Node::RemoveChild(CXFA_Node* pNode, FX_BOOL bNotify) {
static_cast<CFDE_XMLElement*>(pNode->m_pXMLNode);
CFX_WideStringC wsAttributeName =
pNode->GetCData(XFA_ATTRIBUTE_QualifiedName);
- pXMLElement->RemoveAttribute(wsAttributeName.raw_str());
+ pXMLElement->RemoveAttribute(wsAttributeName.c_str());
}
CFX_WideString wsName;
pNode->GetAttribute(XFA_ATTRIBUTE_Name, wsName, FALSE);
@@ -4771,7 +4771,7 @@ FX_BOOL CXFA_Node::RemoveChild(CXFA_Node* pNode, FX_BOOL bNotify) {
}
CXFA_Node* CXFA_Node::GetFirstChildByName(const CFX_WideStringC& wsName) const {
return GetFirstChildByName(
- wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+ wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
wsName.GetLength()));
}
CXFA_Node* CXFA_Node::GetFirstChildByName(uint32_t dwNameHash) const {
@@ -4805,7 +4805,7 @@ CXFA_Node* CXFA_Node::GetNextSameNameSibling(
const CFX_WideStringC& wsNodeName) const {
return GetNextSameNameSibling(
wsNodeName.IsEmpty() ? 0
- : FX_HashCode_String_GetW(wsNodeName.raw_str(),
+ : FX_HashCode_String_GetW(wsNodeName.c_str(),
wsNodeName.GetLength()));
}
CXFA_Node* CXFA_Node::GetNextSameClassSibling(XFA_ELEMENT eElement) const {
@@ -4998,13 +4998,13 @@ void CXFA_Node::UpdateNameHash() {
if (!pNotsure || pNotsure->eType == XFA_ATTRIBUTETYPE_Cdata) {
CFX_WideStringC wsName = GetCData(XFA_ATTRIBUTE_Name);
m_dwNameHash =
- wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+ wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
wsName.GetLength());
} else if (pNotsure->eType == XFA_ATTRIBUTETYPE_Enum) {
CFX_WideStringC wsName =
XFA_GetAttributeEnumByID(GetEnum(XFA_ATTRIBUTE_Name))->pName;
m_dwNameHash =
- wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.raw_str(),
+ wsName.IsEmpty() ? 0 : FX_HashCode_String_GetW(wsName.c_str(),
wsName.GetLength());
}
}
@@ -5050,7 +5050,7 @@ FX_BOOL CXFA_Node::GetMapModuleValue(void* pKey, void*& pValue) {
return FALSE;
}
void CXFA_Node::SetMapModuleString(void* pKey, const CFX_WideStringC& wsValue) {
- SetMapModuleBuffer(pKey, (void*)wsValue.raw_str(),
+ SetMapModuleBuffer(pKey, (void*)wsValue.c_str(),
wsValue.GetLength() * sizeof(FX_WCHAR));
}
FX_BOOL CXFA_Node::GetMapModuleString(void* pKey, CFX_WideStringC& wsValue) {
@@ -5279,7 +5279,7 @@ CXFA_NodeList::CXFA_NodeList(CXFA_Document* pDocument)
CXFA_Node* CXFA_NodeList::NamedItem(const CFX_WideStringC& wsName) {
int32_t iCount = GetLength();
uint32_t dwHashCode =
- FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength());
+ FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength());
for (int32_t i = 0; i < iCount; i++) {
CXFA_Node* ret = Item(i);
if (dwHashCode == ret->GetNameHash()) {
diff --git a/xfa/fxfa/parser/xfa_objectacc_imp.cpp b/xfa/fxfa/parser/xfa_objectacc_imp.cpp
index 22f8fc2b34..c0f281dc24 100644
--- a/xfa/fxfa/parser/xfa_objectacc_imp.cpp
+++ b/xfa/fxfa/parser/xfa_objectacc_imp.cpp
@@ -24,7 +24,7 @@ static FX_ARGB XFA_WStringToColor(const CFX_WideStringC& wsValue) {
return 0xff000000;
}
int cc = 0;
- const FX_WCHAR* str = wsValue.raw_str();
+ const FX_WCHAR* str = wsValue.c_str();
int len = wsValue.GetLength();
while (XFA_IsSpace(str[cc]) && cc < len) {
cc++;
@@ -1239,7 +1239,7 @@ CXFA_Node* CXFA_WidgetData::SetSelectedMember(const CFX_WideStringC& wsName,
FX_BOOL bNotify) {
CXFA_Node* pSelectedMember = NULL;
uint32_t nameHash =
- FX_HashCode_String_GetW(wsName.raw_str(), wsName.GetLength());
+ FX_HashCode_String_GetW(wsName.c_str(), wsName.GetLength());
for (CXFA_Node* pNode = ToNode(m_pNode->GetNodeItem(XFA_NODEITEM_FirstChild));
pNode; pNode = pNode->GetNodeItem(XFA_NODEITEM_NextSibling)) {
if (pNode->GetNameHash() == nameHash) {
diff --git a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
index 08e9cede92..c71384e130 100644
--- a/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
+++ b/xfa/fxfa/parser/xfa_script_hostpseudomodel.cpp
@@ -416,7 +416,7 @@ static int32_t XFA_FilterName(const CFX_WideStringC& wsExpression,
}
FX_WCHAR* pBuf = wsFilter.GetBuffer(iLength - nStart);
int32_t nCount = 0;
- const FX_WCHAR* pSrc = wsExpression.raw_str();
+ const FX_WCHAR* pSrc = wsExpression.c_str();
FX_WCHAR wCur;
while (nStart < iLength) {
wCur = pSrc[nStart++];
diff --git a/xfa/fxfa/parser/xfa_script_imp.cpp b/xfa/fxfa/parser/xfa_script_imp.cpp
index fe6caa84bc..0b5cb1d156 100644
--- a/xfa/fxfa/parser/xfa_script_imp.cpp
+++ b/xfa/fxfa/parser/xfa_script_imp.cpp
@@ -96,7 +96,7 @@ FX_BOOL CXFA_ScriptContext::RunScript(XFA_SCRIPTLANGTYPE eScriptType,
btScript =
FX_UTF8Encode(wsJavaScript.GetBuffer(), wsJavaScript.GetLength());
} else {
- btScript = FX_UTF8Encode(wsScript.raw_str(), wsScript.GetLength());
+ btScript = FX_UTF8Encode(wsScript.c_str(), wsScript.GetLength());
}
CXFA_Object* pOriginalObject = m_pThisObject;
m_pThisObject = pThisObject;
@@ -466,7 +466,7 @@ FX_BOOL CXFA_ScriptContext::RunVariablesScript(CXFA_Node* pScriptNode) {
return FALSE;
}
CFX_ByteString btScript =
- FX_UTF8Encode(wsScript.raw_str(), wsScript.GetLength());
+ FX_UTF8Encode(wsScript.c_str(), wsScript.GetLength());
FXJSE_HVALUE hRetValue = FXJSE_Value_Create(m_hJsRuntime);
CXFA_Node* pThisObject = pParent->GetNodeItem(XFA_NODEITEM_Parent);
FXJSE_HCONTEXT hVariablesContext =
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
index 8ad8b13176..f86a65e712 100644
--- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
+++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp
@@ -538,7 +538,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_GetFilter(
int32_t nConditionCount = 0;
CFX_Int32Array stack;
int32_t nType = -1;
- const FX_WCHAR* pSrc = wsExpression.raw_str();
+ const FX_WCHAR* pSrc = wsExpression.c_str();
FX_WCHAR wPrev = 0, wCur;
FX_BOOL bIsCondition = FALSE;
while (nStart < iLength) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 17:36:44 +0000