summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fxjs/cjx_node.cpp80
-rw-r--r--fxjs/cjx_node.h9
-rw-r--r--xfa/fxfa/cxfa_ffdocview.cpp12
-rw-r--r--xfa/fxfa/cxfa_textlayout.cpp4
-rw-r--r--xfa/fxfa/cxfa_widgetacc.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_nodelocale.cpp6
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.cpp12
7 files changed, 52 insertions, 73 deletions
diff --git a/fxjs/cjx_node.cpp b/fxjs/cjx_node.cpp
index 0a053eec3e..e0fbe2f51d 100644
--- a/fxjs/cjx_node.cpp
+++ b/fxjs/cjx_node.cpp
@@ -1454,9 +1454,9 @@ void CJX_Node::Script_Som_DefaultValue(CFXJSE_Value* pValue,
if (pContainerWidgetData) {
pContainerWidgetData->GetFormatDataValue(wsNewValue, wsFormatValue);
}
- SetScriptContent(wsNewValue, wsFormatValue, true, true, true);
+ SetContent(wsNewValue, wsFormatValue, true, true, true);
} else {
- WideString content = GetScriptContent(true);
+ WideString content = GetContent(true);
if (content.IsEmpty() && eType != XFA_Element::Text &&
eType != XFA_Element::SubmitUrl) {
pValue->SetNull();
@@ -1479,7 +1479,7 @@ void CJX_Node::Script_Som_DefaultValue_Read(CFXJSE_Value* pValue,
return;
}
- WideString content = GetScriptContent(true);
+ WideString content = GetContent(true);
if (content.IsEmpty()) {
pValue->SetNull();
return;
@@ -1503,9 +1503,9 @@ void CJX_Node::Script_Boolean_Value(CFXJSE_Value* pValue,
if (pContainerWidgetData) {
pContainerWidgetData->GetFormatDataValue(wsNewValue, wsFormatValue);
}
- SetScriptContent(wsNewValue, wsFormatValue, true, true, true);
+ SetContent(wsNewValue, wsFormatValue, true, true, true);
} else {
- WideString wsValue = GetScriptContent(true);
+ WideString wsValue = GetContent(true);
pValue->SetBoolean(wsValue == L"1");
}
}
@@ -1630,11 +1630,11 @@ void CJX_Node::Script_Draw_DefaultValue(CFXJSE_Value* pValue,
if (uiType == XFA_Element::Text) {
WideString wsNewValue = pValue->ToWideString();
WideString wsFormatValue(wsNewValue);
- SetScriptContent(wsNewValue, wsFormatValue, true, true, true);
+ SetContent(wsNewValue, wsFormatValue, true, true, true);
}
}
} else {
- WideString content = GetScriptContent(true);
+ WideString content = GetContent(true);
if (content.IsEmpty())
pValue->SetNull();
else
@@ -1676,9 +1676,9 @@ void CJX_Node::Script_Field_DefaultValue(CFXJSE_Value* pValue,
if (pContainerWidgetData) {
pContainerWidgetData->GetFormatDataValue(wsNewText, wsFormatText);
}
- SetScriptContent(wsNewText, wsFormatText, true, true, true);
+ SetContent(wsNewText, wsFormatText, true, true, true);
} else {
- WideString content = GetScriptContent(true);
+ WideString content = GetContent(true);
if (content.IsEmpty()) {
pValue->SetNull();
} else {
@@ -2067,7 +2067,7 @@ void CJX_Node::Script_ExclGroup_DefaultAndRawValue(CFXJSE_Value* pValue,
pWidgetData->SetSelectedMemberByValue(pValue->ToWideString().AsStringView(),
true, true, true);
} else {
- WideString wsValue = GetScriptContent(true);
+ WideString wsValue = GetContent(true);
XFA_VERSION curVersion = GetDocument()->GetCurVersionMode();
if (wsValue.IsEmpty() && curVersion >= XFA_VERSION_300) {
pValue->SetNull();
@@ -3332,11 +3332,11 @@ bool CJX_Node::TryUserData(void* pKey, void*& pData, bool bProtoAlso) {
return iBytes == sizeof(void*) && memcpy(&pData, pData, iBytes);
}
-bool CJX_Node::SetScriptContent(const WideString& wsContent,
- const WideString& wsXMLValue,
- bool bNotify,
- bool bScriptModify,
- bool bSyncData) {
+bool CJX_Node::SetContent(const WideString& wsContent,
+ const WideString& wsXMLValue,
+ bool bNotify,
+ bool bScriptModify,
+ bool bSyncData) {
CXFA_Node* pNode = nullptr;
CXFA_Node* pBindNode = nullptr;
switch (GetXFANode()->GetObjectType()) {
@@ -3350,8 +3350,8 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent,
ASSERT(pChildValue);
pChildValue->JSNode()->SetCData(XFA_ATTRIBUTE_ContentType, L"text/xml",
false, false);
- pChildValue->JSNode()->SetScriptContent(wsContent, wsContent, bNotify,
- bScriptModify, false);
+ pChildValue->JSNode()->SetContent(wsContent, wsContent, bNotify,
+ bScriptModify, false);
CXFA_Node* pBind = GetXFANode()->GetBindData();
if (bSyncData && pBind) {
std::vector<WideString> wsSaveTextArray;
@@ -3415,8 +3415,8 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent,
}
for (CXFA_Node* pArrayNode : pBind->GetBindItems()) {
if (pArrayNode != GetXFANode()) {
- pArrayNode->JSNode()->SetScriptContent(
- wsContent, wsContent, bNotify, bScriptModify, false);
+ pArrayNode->JSNode()->SetContent(wsContent, wsContent, bNotify,
+ bScriptModify, false);
}
}
}
@@ -3431,17 +3431,17 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent,
CXFA_Node* pChildValue = pValue->GetNodeItem(XFA_NODEITEM_FirstChild);
ASSERT(pChildValue);
- pChildValue->JSNode()->SetScriptContent(wsContent, wsContent, bNotify,
- bScriptModify, false);
+ pChildValue->JSNode()->SetContent(wsContent, wsContent, bNotify,
+ bScriptModify, false);
}
pBindNode = GetXFANode()->GetBindData();
if (pBindNode && bSyncData) {
- pBindNode->JSNode()->SetScriptContent(wsContent, wsXMLValue, bNotify,
- bScriptModify, false);
+ pBindNode->JSNode()->SetContent(wsContent, wsXMLValue, bNotify,
+ bScriptModify, false);
for (CXFA_Node* pArrayNode : pBindNode->GetBindItems()) {
if (pArrayNode != GetXFANode()) {
- pArrayNode->JSNode()->SetScriptContent(wsContent, wsContent,
- bNotify, true, false);
+ pArrayNode->JSNode()->SetContent(wsContent, wsContent, bNotify,
+ true, false);
}
}
}
@@ -3466,7 +3466,7 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent,
: XFA_Element::Sharptext);
GetXFANode()->InsertChild(pContentRawDataNode);
}
- return pContentRawDataNode->JSNode()->SetScriptContent(
+ return pContentRawDataNode->JSNode()->SetContent(
wsContent, wsXMLValue, bNotify, bScriptModify, bSyncData);
}
case XFA_ObjectType::NodeC:
@@ -3485,8 +3485,8 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent,
if (pParent && pParent->IsContainerNode()) {
pBindNode = pParent->GetBindData();
if (pBindNode) {
- pBindNode->JSNode()->SetScriptContent(
- wsContent, wsXMLValue, bNotify, bScriptModify, false);
+ pBindNode->JSNode()->SetContent(wsContent, wsXMLValue, bNotify,
+ bScriptModify, false);
}
}
}
@@ -3505,31 +3505,18 @@ bool CJX_Node::SetScriptContent(const WideString& wsContent,
SetAttributeValue(wsContent, wsXMLValue, bNotify, bScriptModify);
if (pBindNode && bSyncData) {
for (CXFA_Node* pArrayNode : pBindNode->GetBindItems()) {
- pArrayNode->JSNode()->SetScriptContent(wsContent, wsContent, bNotify,
- bScriptModify, false);
+ pArrayNode->JSNode()->SetContent(wsContent, wsContent, bNotify,
+ bScriptModify, false);
}
}
return true;
}
-bool CJX_Node::SetContent(const WideString& wsContent,
- const WideString& wsXMLValue,
- bool bNotify,
- bool bScriptModify,
- bool bSyncData) {
- return SetScriptContent(wsContent, wsXMLValue, bNotify, bScriptModify,
- bSyncData);
-}
-
-WideString CJX_Node::GetScriptContent(bool bScriptModify) {
+WideString CJX_Node::GetContent(bool bScriptModify) {
WideString wsContent;
return TryContent(wsContent, bScriptModify, true) ? wsContent : WideString();
}
-WideString CJX_Node::GetContent() {
- return GetScriptContent(false);
-}
-
bool CJX_Node::TryContent(WideString& wsContent,
bool bScriptModify,
bool bProto) {
@@ -3886,14 +3873,13 @@ void CJX_Node::MoveBufferMapData(CXFA_Node* pDstModule, void* pKey) {
}
}
if (pDstModule->IsNodeV()) {
- WideString wsValue = pDstModule->JSNode()->GetScriptContent(false);
+ WideString wsValue = pDstModule->JSNode()->GetContent(false);
WideString wsFormatValue(wsValue);
CXFA_WidgetData* pWidgetData = pDstModule->GetContainerWidgetData();
if (pWidgetData) {
pWidgetData->GetFormatDataValue(wsValue, wsFormatValue);
}
- pDstModule->JSNode()->SetScriptContent(wsValue, wsFormatValue, true, true,
- true);
+ pDstModule->JSNode()->SetContent(wsValue, wsFormatValue, true, true, true);
}
}
diff --git a/fxjs/cjx_node.h b/fxjs/cjx_node.h
index 130f759812..1864643f91 100644
--- a/fxjs/cjx_node.h
+++ b/fxjs/cjx_node.h
@@ -78,7 +78,7 @@ class CJX_Node : public CJX_Object {
bool bNotify,
bool bScriptModify,
bool bSyncData);
- WideString GetContent();
+ WideString GetContent(bool bScriptModify);
bool TryInteger(XFA_ATTRIBUTE eAttr, int32_t& iValue, bool bUseDefault);
bool SetInteger(XFA_ATTRIBUTE eAttr, int32_t iValue, bool bNotify);
@@ -428,13 +428,6 @@ class CJX_Node : public CJX_Object {
bool TryUserData(void* pKey, void*& pData, bool bProtoAlso);
- bool SetScriptContent(const WideString& wsContent,
- const WideString& wsXMLValue,
- bool bNotify,
- bool bScriptModify,
- bool bSyncData);
- WideString GetScriptContent(bool bScriptModify);
-
XFA_MAPMODULEDATA* CreateMapModuleData();
XFA_MAPMODULEDATA* GetMapModuleData() const;
void SetMapModuleValue(void* pKey, void* pValue);
diff --git a/xfa/fxfa/cxfa_ffdocview.cpp b/xfa/fxfa/cxfa_ffdocview.cpp
index 7d48a309ee..a2c4893446 100644
--- a/xfa/fxfa/cxfa_ffdocview.cpp
+++ b/xfa/fxfa/cxfa_ffdocview.cpp
@@ -281,7 +281,7 @@ int32_t CXFA_FFDocView::ProcessWidgetEvent(CXFA_EventParam* pParam,
: nullptr;
}
if (pValidateNode)
- wsValidateStr = pValidateNode->JSNode()->GetContent();
+ wsValidateStr = pValidateNode->JSNode()->GetContent(false);
}
if (!wsValidateStr.Contains(L"preSubmit"))
@@ -746,20 +746,20 @@ void CXFA_FFDocView::RunBindItems() {
continue;
if (bValueUseContent) {
- wsValue = refNode->JSNode()->GetContent();
+ wsValue = refNode->JSNode()->GetContent(false);
} else {
CXFA_Node* nodeValue = refNode->GetFirstChildByName(uValueHash);
- wsValue = nodeValue ? nodeValue->JSNode()->GetContent()
- : refNode->JSNode()->GetContent();
+ wsValue = nodeValue ? nodeValue->JSNode()->GetContent(false)
+ : refNode->JSNode()->GetContent(false);
}
if (!bUseValue) {
if (bLabelUseContent) {
- wsLabel = refNode->JSNode()->GetContent();
+ wsLabel = refNode->JSNode()->GetContent(false);
} else {
CXFA_Node* nodeLabel = refNode->GetFirstChildByName(wsLabelRef);
if (nodeLabel)
- wsLabel = nodeLabel->JSNode()->GetContent();
+ wsLabel = nodeLabel->JSNode()->GetContent(false);
}
} else {
wsLabel = wsValue;
diff --git a/xfa/fxfa/cxfa_textlayout.cpp b/xfa/fxfa/cxfa_textlayout.cpp
index 5d4d262999..84b183f76b 100644
--- a/xfa/fxfa/cxfa_textlayout.cpp
+++ b/xfa/fxfa/cxfa_textlayout.cpp
@@ -241,7 +241,7 @@ int32_t CXFA_TextLayout::GetText(WideString& wsText) {
GetTextDataNode();
wsText.clear();
if (!m_bRichText)
- wsText = m_pTextDataNode->JSNode()->GetContent();
+ wsText = m_pTextDataNode->JSNode()->GetContent(false);
return wsText.GetLength();
}
@@ -676,7 +676,7 @@ void CXFA_TextLayout::LoadText(CXFA_Node* pNode,
}
}
- WideString wsText = pNode->JSNode()->GetContent();
+ WideString wsText = pNode->JSNode()->GetContent(false);
wsText.TrimRight(L" ");
bool bRet = AppendChar(wsText, fLinePos, fSpaceAbove, bSavePieces);
if (bRet && m_pLoader)
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index a75fa2a2b4..9dc9603377 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -226,7 +226,7 @@ void CXFA_WidgetAcc::ResetData() {
if (pItems->CountChildren(XFA_Element::Unknown) > 1) {
itemText = pItems->GetChild(1, XFA_Element::Unknown)
->JSNode()
- ->GetContent();
+ ->GetContent(false);
}
pAcc->SetValue(itemText, XFA_VALUEPICTURE_Raw);
diff --git a/xfa/fxfa/parser/cxfa_nodelocale.cpp b/xfa/fxfa/parser/cxfa_nodelocale.cpp
index 5a3eb20887..7a941dff66 100644
--- a/xfa/fxfa/parser/cxfa_nodelocale.cpp
+++ b/xfa/fxfa/parser/cxfa_nodelocale.cpp
@@ -71,7 +71,7 @@ WideString CXFA_NodeLocale::GetDateTimeSymbols() const {
CXFA_Node* pSymbols =
m_pLocale ? m_pLocale->GetChild(0, XFA_Element::DateTimeSymbols)
: nullptr;
- return pSymbols ? pSymbols->JSNode()->GetContent() : WideString();
+ return pSymbols ? pSymbols->JSNode()->GetContent(false) : WideString();
}
WideString CXFA_NodeLocale::GetMonthName(int32_t nMonth, bool bAbbr) const {
@@ -149,7 +149,7 @@ WideString CXFA_NodeLocale::GetSymbol(XFA_Element eElement,
const WideStringView& symbol_type) const {
CXFA_Node* pSymbols = m_pLocale ? m_pLocale->GetChild(0, eElement) : nullptr;
CXFA_Node* pSymbol = GetNodeByName(pSymbols, symbol_type);
- return pSymbol ? pSymbol->JSNode()->GetContent() : WideString();
+ return pSymbol ? pSymbol->JSNode()->GetContent(false) : WideString();
}
WideString CXFA_NodeLocale::GetCalendarSymbol(XFA_Element eElement,
@@ -165,7 +165,7 @@ WideString CXFA_NodeLocale::GetCalendarSymbol(XFA_Element eElement,
for (; pNode; pNode = pNode->GetNextSameClassSibling(eElement)) {
if (pNode->JSNode()->GetBoolean(XFA_ATTRIBUTE_Abbr) == bAbbr) {
CXFA_Node* pSymbol = pNode->GetChild(index, XFA_Element::Unknown);
- return pSymbol ? pSymbol->JSNode()->GetContent() : WideString();
+ return pSymbol ? pSymbol->JSNode()->GetContent(false) : WideString();
}
}
return WideString();
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index e44c77d061..d65eff473c 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -253,7 +253,7 @@ XFA_Element CXFA_WidgetData::GetUIType() {
}
WideString CXFA_WidgetData::GetRawValue() {
- return m_pNode->JSNode()->GetContent();
+ return m_pNode->JSNode()->GetContent(false);
}
int32_t CXFA_WidgetData::GetAccess() {
@@ -562,12 +562,12 @@ void CXFA_WidgetData::SetCheckState(XFA_CHECKSTATE eCheckState, bool bNotify) {
if (!pItemchild)
continue;
- WideString text = pItemchild->JSNode()->GetContent();
+ WideString text = pItemchild->JSNode()->GetContent(false);
WideString wsChildValue = text;
if (wsValue != text) {
pItemchild = pItemchild->GetNodeItem(XFA_NODEITEM_NextSibling);
if (pItemchild)
- wsChildValue = pItemchild->JSNode()->GetContent();
+ wsChildValue = pItemchild->JSNode()->GetContent(false);
else
wsChildValue.clear();
}
@@ -651,11 +651,11 @@ void CXFA_WidgetData::SetSelectedMemberByValue(const WideStringView& wsValue,
if (!pItemchild)
continue;
- WideString wsChildValue = pItemchild->JSNode()->GetContent();
+ WideString wsChildValue = pItemchild->JSNode()->GetContent(false);
if (wsValue != wsChildValue) {
pItemchild = pItemchild->GetNodeItem(XFA_NODEITEM_NextSibling);
if (pItemchild)
- wsChildValue = pItemchild->JSNode()->GetContent();
+ wsChildValue = pItemchild->JSNode()->GetContent(false);
else
wsChildValue.clear();
} else {
@@ -1598,7 +1598,7 @@ IFX_Locale* CXFA_WidgetData::GetLocal() {
bool CXFA_WidgetData::GetValue(WideString& wsValue,
XFA_VALUEPICTURE eValueType) {
- wsValue = m_pNode->JSNode()->GetContent();
+ wsValue = m_pNode->JSNode()->GetContent(false);
if (eValueType == XFA_VALUEPICTURE_Display)
GetItemLabel(wsValue.AsStringView(), wsValue);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 16:26:29 +0000