| Index: xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
|
| diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
|
| index b9c154fca1a0568d01c7f1b49b33420f670035ba..a3953aa88fd33bf0a74ac3c4fc7d107ac0a55b84 100644
|
| --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
|
| +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.cpp
|
| @@ -21,18 +21,18 @@
|
| #include "xfa_layout_pagemgr_new.h"
|
| #include "xfa_layout_appadapter.h"
|
| IXFA_DocLayout* IXFA_LayoutPage::GetLayout() const {
|
| - CXFA_ContainerLayoutItemImpl* pThis = (CXFA_ContainerLayoutItemImpl*)this;
|
| + CXFA_ContainerLayoutItem* pThis = (CXFA_ContainerLayoutItem*)this;
|
| return pThis->m_pFormNode->GetDocument()->GetLayoutProcessor();
|
| }
|
| int32_t IXFA_LayoutPage::GetPageIndex() const {
|
| - CXFA_ContainerLayoutItemImpl* pThis = (CXFA_ContainerLayoutItemImpl*)this;
|
| + CXFA_ContainerLayoutItem* pThis = (CXFA_ContainerLayoutItem*)this;
|
| return pThis->m_pFormNode->GetDocument()
|
| ->GetLayoutProcessor()
|
| ->GetLayoutPageMgr()
|
| ->GetPageIndex((IXFA_LayoutPage*)this);
|
| }
|
| void IXFA_LayoutPage::GetPageSize(CFX_SizeF& size) {
|
| - CXFA_ContainerLayoutItemImpl* pThis = (CXFA_ContainerLayoutItemImpl*)this;
|
| + CXFA_ContainerLayoutItem* pThis = (CXFA_ContainerLayoutItem*)this;
|
| size.Set(0, 0);
|
| CXFA_Node* pMedium =
|
| pThis->m_pFormNode->GetFirstChildByClass(XFA_ELEMENT_Medium);
|
| @@ -46,7 +46,7 @@ void IXFA_LayoutPage::GetPageSize(CFX_SizeF& size) {
|
| }
|
| }
|
| CXFA_Node* IXFA_LayoutPage::GetMasterPage() const {
|
| - CXFA_ContainerLayoutItemImpl* pThis = (CXFA_ContainerLayoutItemImpl*)this;
|
| + CXFA_ContainerLayoutItem* pThis = (CXFA_ContainerLayoutItem*)this;
|
| return pThis->m_pFormNode;
|
| }
|
| FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant) {
|
| @@ -69,8 +69,8 @@ FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant) {
|
| }
|
| return dwRelevant;
|
| }
|
| -void XFA_ReleaseLayoutItem(CXFA_LayoutItemImpl* pLayoutItem) {
|
| - CXFA_LayoutItemImpl *pNext, *pNode = pLayoutItem->m_pFirstChild;
|
| +void XFA_ReleaseLayoutItem(CXFA_LayoutItem* pLayoutItem) {
|
| + CXFA_LayoutItem* pNext, * pNode = pLayoutItem->m_pFirstChild;
|
| while (pNode) {
|
| pNext = pNode->m_pNextSibling;
|
| pNode->m_pParent = NULL;
|
|
|