3 files changed, 23 insertions, 19 deletions
diff --git a/fxjs/xfa/cjx_boolean.cpp b/fxjs/xfa/cjx_boolean.cpp
index 761d0a2be9..6f62fcbe31 100644
--- a/fxjs/xfa/cjx_boolean.cpp
+++ b/fxjs/xfa/cjx_boolean.cpp
@@ -36,10 +36,11 @@ void CJX_Boolean::defaultValue(CFXJSE_Value* pValue,
   int32_t iValue = FXSYS_atoi(newValue.c_str());
   WideString wsNewValue(iValue == 0 ? L"0" : L"1");
   WideString wsFormatValue(wsNewValue);
-  CXFA_WidgetAcc* pContainerWidgetAcc =
-      ToNode(GetXFAObject())->GetContainerWidgetAcc();
-  if (pContainerWidgetAcc)
-    wsFormatValue = pContainerWidgetAcc->GetFormatDataValue(wsNewValue);
+  CXFA_Node* pContainerNode = ToNode(GetXFAObject())->GetContainerNode();
+  if (pContainerNode && pContainerNode->GetWidgetAcc()) {
+    wsFormatValue =
+        pContainerNode->GetWidgetAcc()->GetFormatDataValue(wsNewValue);
+  }
 
   SetContent(wsNewValue, wsFormatValue, true, true, true);
 }
diff --git a/fxjs/xfa/cjx_field.cpp b/fxjs/xfa/cjx_field.cpp
index 828bfb9a0d..e1e3881aa1 100644
--- a/fxjs/xfa/cjx_field.cpp
+++ b/fxjs/xfa/cjx_field.cpp
@@ -261,10 +261,12 @@ void CJX_Field::defaultValue(CFXJSE_Value* pValue,
           wsNewText, pWidgetAcc->GetLeadDigits(), pWidgetAcc->GetFracDigits());
     }
 
-    CXFA_WidgetAcc* pContainerWidgetAcc = xfaNode->GetContainerWidgetAcc();
+    CXFA_Node* pContainerNode = xfaNode->GetContainerNode();
     WideString wsFormatText(wsNewText);
-    if (pContainerWidgetAcc)
-      wsFormatText = pContainerWidgetAcc->GetFormatDataValue(wsNewText);
+    if (pContainerNode && pContainerNode->GetWidgetAcc()) {
+      wsFormatText =
+          pContainerNode->GetWidgetAcc()->GetFormatDataValue(wsNewText);
+    }
 
     SetContent(wsNewText, wsFormatText, true, true, true);
     return;
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index 4f3b6adbc8..73ec3fa5c0 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -1158,9 +1158,9 @@ void CJX_Object::MoveBufferMapData(CXFA_Object* pDstModule) {
 
   WideString wsValue = ToNode(pDstModule)->JSObject()->GetContent(false);
   WideString wsFormatValue(wsValue);
-  CXFA_WidgetAcc* pWidgetAcc = ToNode(pDstModule)->GetContainerWidgetAcc();
-  if (pWidgetAcc)
-    wsFormatValue = pWidgetAcc->GetFormatDataValue(wsValue);
+  CXFA_Node* pNode = ToNode(pDstModule)->GetContainerNode();
+  if (pNode && pNode->GetWidgetAcc())
+    wsFormatValue = pNode->GetWidgetAcc()->GetFormatDataValue(wsValue);
 
   ToNode(pDstModule)
       ->JSObject()
@@ -1516,30 +1516,31 @@ void CJX_Object::Script_Som_DefaultValue(CFXJSE_Value* pValue,
       wsNewValue = pValue->ToWideString();
 
     WideString wsFormatValue(wsNewValue);
-    CXFA_WidgetAcc* pContainerWidgetAcc = nullptr;
+    CXFA_Node* pContainerNode = nullptr;
     if (ToNode(GetXFAObject())->GetPacketType() == XFA_PacketType::Datasets) {
       WideString wsPicture;
       for (const auto& pFormNode : *(ToNode(GetXFAObject())->GetBindItems())) {
         if (!pFormNode || pFormNode->HasRemovedChildren())
           continue;
 
-        pContainerWidgetAcc = pFormNode->GetContainerWidgetAcc();
-        if (pContainerWidgetAcc) {
-          wsPicture =
-              pContainerWidgetAcc->GetPictureContent(XFA_VALUEPICTURE_DataBind);
+        pContainerNode = pFormNode->GetContainerNode();
+        if (pContainerNode && pContainerNode->GetWidgetAcc()) {
+          wsPicture = pContainerNode->GetWidgetAcc()->GetPictureContent(
+              XFA_VALUEPICTURE_DataBind);
         }
         if (!wsPicture.IsEmpty())
           break;
 
-        pContainerWidgetAcc = nullptr;
+        pContainerNode = nullptr;
       }
     } else if (ToNode(GetXFAObject())->GetPacketType() ==
                XFA_PacketType::Form) {
-      pContainerWidgetAcc = ToNode(GetXFAObject())->GetContainerWidgetAcc();
+      pContainerNode = ToNode(GetXFAObject())->GetContainerNode();
     }
 
-    if (pContainerWidgetAcc)
-      wsFormatValue = pContainerWidgetAcc->GetFormatDataValue(wsNewValue);
+    if (pContainerNode && pContainerNode->GetWidgetAcc())
+      wsFormatValue =
+          pContainerNode->GetWidgetAcc()->GetFormatDataValue(wsNewValue);
 
     SetContent(wsNewValue, wsFormatValue, true, true, true);
     return;