1 files changed, 4 insertions, 9 deletions
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
index 012aa4c6a5..87745616e0 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
@@ -100,8 +100,7 @@ void XFA_XPDPacket_MergeRootNode(CXFA_Node* pOriginRoot, CXFA_Node* pNewRoot) {
 int32_t CXFA_FFDoc::DoLoad(IFX_Pause* pPause) {
   int32_t iStatus = m_pDocument->GetParser()->DoParse(pPause);
   if (iStatus == XFA_PARSESTATUS_Done && !m_pPDFDoc) {
-    CXFA_Node* pPDFNode =
-        (CXFA_Node*)m_pDocument->GetXFAObject(XFA_HASHCODE_Pdf);
+    CXFA_Node* pPDFNode = ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Pdf));
     if (!pPDFNode) {
       return XFA_PARSESTATUS_SyntaxErr;
     }
@@ -160,8 +159,7 @@ int32_t CXFA_FFDoc::DoLoad(IFX_Pause* pPause) {
 void CXFA_FFDoc::StopLoad() {
   m_pApp->GetXFAFontMgr()->LoadDocFonts(this);
   m_dwDocType = XFA_DOCTYPE_Static;
-  CXFA_Node* pConfig =
-      (CXFA_Node*)m_pDocument->GetXFAObject(XFA_HASHCODE_Config);
+  CXFA_Node* pConfig = ToNode(m_pDocument->GetXFAObject(XFA_HASHCODE_Config));
   if (!pConfig) {
     return;
   }
@@ -397,9 +395,7 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName,
 IFDE_XMLElement* CXFA_FFDoc::GetPackageData(const CFX_WideStringC& wsPackage) {
   FX_DWORD packetHash =
       FX_HashCode_String_GetW(wsPackage.GetPtr(), wsPackage.GetLength());
-  CXFA_Object* pObject = m_pDocument->GetXFAObject(packetHash);
-  CXFA_Node* pNode =
-      (pObject && pObject->IsNode()) ? (CXFA_Node*)pObject : NULL;
+  CXFA_Node* pNode = ToNode(m_pDocument->GetXFAObject(packetHash));
   if (!pNode) {
     return NULL;
   }
@@ -421,8 +417,7 @@ FX_BOOL CXFA_FFDoc::SavePackage(const CFX_WideStringC& wsPackage,
   if (packetHash == XFA_HASHCODE_Xfa) {
     pNode = m_pDocument->GetRoot();
   } else {
-    CXFA_Object* pObject = m_pDocument->GetXFAObject(packetHash);
-    pNode = (pObject && pObject->IsNode()) ? (CXFA_Node*)pObject : NULL;
+    pNode = ToNode(m_pDocument->GetXFAObject(packetHash));
   }
   FX_BOOL bFlags = FALSE;
   if (pNode) {