summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fxjs/cjx_node.h6
-rw-r--r--xfa/fxfa/cxfa_ffwidgethandler.cpp2
-rw-r--r--xfa/fxfa/cxfa_widgetacc.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_validate.cpp4
-rw-r--r--xfa/fxfa/parser/cxfa_widgetdata.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/fxjs/cjx_node.h b/fxjs/cjx_node.h
index b9a41deaf4..963cf0de4e 100644
--- a/fxjs/cjx_node.h
+++ b/fxjs/cjx_node.h
@@ -75,9 +75,9 @@ class CJX_Node : public CJX_Object {
bool SetContent(const WideString& wsContent,
const WideString& wsXMLValue,
- bool bNotify = false,
- bool bScriptModify = false,
- bool bSyncData = true);
+ bool bNotify,
+ bool bScriptModify,
+ bool bSyncData);
WideString GetContent();
bool TryInteger(XFA_ATTRIBUTE eAttr,
diff --git a/xfa/fxfa/cxfa_ffwidgethandler.cpp b/xfa/fxfa/cxfa_ffwidgethandler.cpp
index 0a4033d6c7..e7221f9d4a 100644
--- a/xfa/fxfa/cxfa_ffwidgethandler.cpp
+++ b/xfa/fxfa/cxfa_ffwidgethandler.cpp
@@ -313,7 +313,7 @@ CXFA_Node* CXFA_FFWidgetHandler::CreatePushButton(CXFA_Node* pParent,
CXFA_Node* pCaption = CreateCopyNode(XFA_Element::Caption, pField);
CXFA_Node* pValue = CreateCopyNode(XFA_Element::Value, pCaption);
CXFA_Node* pText = CreateCopyNode(XFA_Element::Text, pValue);
- pText->JSNode()->SetContent(L"Button", L"Button", false);
+ pText->JSNode()->SetContent(L"Button", L"Button", false, false, true);
CXFA_Node* pPara = CreateCopyNode(XFA_Element::Para, pCaption);
pPara->JSNode()->SetEnum(XFA_ATTRIBUTE_VAlign, XFA_ATTRIBUTEENUM_Middle,
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index e9946a57d9..c8b4a9389c 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -257,7 +257,7 @@ void CXFA_WidgetAcc::SetImageEdit(const WideString& wsContentType,
}
WideString wsFormatValue(wsData);
GetFormatDataValue(wsData, wsFormatValue);
- m_pNode->JSNode()->SetContent(wsData, wsFormatValue, true);
+ m_pNode->JSNode()->SetContent(wsData, wsFormatValue, true, false, true);
CXFA_Node* pBind = GetDatasets();
if (!pBind) {
image.SetTransferEncoding(XFA_ATTRIBUTEENUM_Base64);
diff --git a/xfa/fxfa/parser/cxfa_validate.cpp b/xfa/fxfa/parser/cxfa_validate.cpp
index 5f784259d2..f2892e507f 100644
--- a/xfa/fxfa/parser/cxfa_validate.cpp
+++ b/xfa/fxfa/parser/cxfa_validate.cpp
@@ -94,14 +94,14 @@ void CXFA_Validate::SetMessageText(WideString& wsMessage,
WideStringView wsName;
pItemNode->JSNode()->TryCData(XFA_ATTRIBUTE_Name, wsName);
if (wsName.IsEmpty() || wsName == wsMessageType) {
- pItemNode->JSNode()->SetContent(wsMessage, wsMessage, false);
+ pItemNode->JSNode()->SetContent(wsMessage, wsMessage, false, false, true);
return;
}
}
CXFA_Node* pTextNode = pNode->CreateSamePacketNode(XFA_Element::Text);
pNode->InsertChild(pTextNode);
pTextNode->JSNode()->SetCData(XFA_ATTRIBUTE_Name, wsMessageType, false);
- pTextNode->JSNode()->SetContent(wsMessage, wsMessage, false);
+ pTextNode->JSNode()->SetContent(wsMessage, wsMessage, false, false, true);
}
void CXFA_Validate::GetScriptMessageText(WideString& wsMessage) {
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index 2704189b22..f6e0f7d55b 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -1822,7 +1822,7 @@ void CXFA_WidgetData::SyncValue(const WideString& wsValue, bool bNotify) {
if (pContainerWidgetData)
pContainerWidgetData->GetFormatDataValue(wsValue, wsFormatValue);
- m_pNode->JSNode()->SetContent(wsValue, wsFormatValue, bNotify);
+ m_pNode->JSNode()->SetContent(wsValue, wsFormatValue, bNotify, false, true);
}
void CXFA_WidgetData::InsertListTextItem(CXFA_Node* pItems,