| Index: xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
 | 
| diff --git a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
 | 
| index b5eaa5f4c63b1cf536ca7d7f345a6144bfb772ac..bba10ba74e642092ca17b4b98e0810732c7b924d 100644
 | 
| --- a/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
 | 
| +++ b/xfa/src/fxfa/src/parser/xfa_document_serialize.cpp
 | 
| @@ -42,13 +42,12 @@ FX_BOOL CXFA_DataImporter::ImportData(IFX_FileRead* pDataDocument) {
 | 
|      return FALSE;
 | 
|    }
 | 
|    CXFA_Node* pDataModel =
 | 
| -      (CXFA_Node*)m_pDocument->GetXFAObject(XFA_HASHCODE_Datasets);
 | 
| +      ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Datasets));
 | 
|    if (!pDataModel) {
 | 
|      pDataDocumentParser->Release();
 | 
|      return FALSE;
 | 
|    }
 | 
| -  CXFA_Node* pDataNode =
 | 
| -      (CXFA_Node*)m_pDocument->GetXFAObject(XFA_HASHCODE_Data);
 | 
| +  CXFA_Node* pDataNode = ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Data));
 | 
|    if (pDataNode) {
 | 
|      pDataModel->RemoveChild(pDataNode);
 | 
|    }
 | 
| @@ -445,7 +444,7 @@ void XFA_DataExporter_RegenerateFormFile(CXFA_Node* pNode,
 | 
|      pStream->WriteString(pURI, FXSYS_wcslen(pURI));
 | 
|      CFX_WideString wsVersionNumber;
 | 
|      XFA_DataExporter_RecognizeXFAVersionNumber(
 | 
| -        (CXFA_Node*)pNode->GetDocument()->GetXFAObject(XFA_XDPPACKET_Template),
 | 
| +        ToNode(pNode->GetDocument()->GetXFAObject(XFA_XDPPACKET_Template)),
 | 
|          wsVersionNumber);
 | 
|      if (wsVersionNumber.IsEmpty()) {
 | 
|        wsVersionNumber = FX_WSTRC(L"2.8");
 | 
| 
 |