diff options
Diffstat (limited to 'xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp')
-rw-r--r-- | xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp index 2066a9fb8c..750bde0a87 100644 --- a/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp +++ b/xfa/src/fxfa/src/parser/xfa_layout_pagemgr_new.cpp @@ -175,7 +175,7 @@ FX_BOOL CXFA_LayoutPageMgr::AppendNewPage(FX_BOOL bFirstTemPage) { if (bFirstTemPage && m_pCurrentContainerRecord == NULL) { m_pCurrentContainerRecord = m_rgProposedContainerRecord.GetHeadPosition(); } - return !bFirstTemPage || m_pCurrentContainerRecord != NULL; + return !bFirstTemPage || m_pCurrentContainerRecord; } static void XFA_LayoutItemMgr_ReorderLayoutItemToTail( CXFA_ContainerLayoutItem* pLayoutItem) { @@ -1711,7 +1711,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() { } if (bIsExistForm) { CXFA_Node* pNewSubform = pFormLayout->m_pFormNode; - if (pContainerItem->m_pOldSubform != NULL && + if (pContainerItem->m_pOldSubform && pContainerItem->m_pOldSubform != pNewSubform) { CXFA_Node* pExistingNode = XFA_DataMerge_FindFormDOMInstance( pDocument, pContainerItem->m_pFormNode->GetClassID(), |