| Index: xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
|
| diff --git a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
|
| index f49ed51ebaf688576f2b68927e8eaddf2a4da84c..66d61dbfde987cdf5bdfd2e2e04e5c2716b743f8 100644
|
| --- a/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
|
| +++ b/xfa/src/fxfa/src/parser/xfa_layout_appadapter.h
|
| @@ -8,66 +8,66 @@
|
| #define _XFA_LAYOUT_APPADAPTER_H_
|
| class CXFA_TraverseStrategy_PageAreaContainerLayoutItem {
|
| public:
|
| - static inline CXFA_ContainerLayoutItemImpl* GetFirstChild(
|
| - CXFA_ContainerLayoutItemImpl* pLayoutItem) {
|
| + static inline CXFA_ContainerLayoutItem* GetFirstChild(
|
| + CXFA_ContainerLayoutItem* pLayoutItem) {
|
| if (pLayoutItem->m_pFormNode->GetClassID() == XFA_ELEMENT_PageSet) {
|
| - return (CXFA_ContainerLayoutItemImpl*)pLayoutItem->m_pFirstChild;
|
| + return (CXFA_ContainerLayoutItem*)pLayoutItem->m_pFirstChild;
|
| }
|
| return NULL;
|
| }
|
| - static inline CXFA_ContainerLayoutItemImpl* GetNextSibling(
|
| - CXFA_ContainerLayoutItemImpl* pLayoutItem) {
|
| - return (CXFA_ContainerLayoutItemImpl*)pLayoutItem->m_pNextSibling;
|
| + static inline CXFA_ContainerLayoutItem* GetNextSibling(
|
| + CXFA_ContainerLayoutItem* pLayoutItem) {
|
| + return (CXFA_ContainerLayoutItem*)pLayoutItem->m_pNextSibling;
|
| }
|
| - static inline CXFA_ContainerLayoutItemImpl* GetParent(
|
| - CXFA_ContainerLayoutItemImpl* pLayoutItem) {
|
| - return (CXFA_ContainerLayoutItemImpl*)pLayoutItem->m_pParent;
|
| + static inline CXFA_ContainerLayoutItem* GetParent(
|
| + CXFA_ContainerLayoutItem* pLayoutItem) {
|
| + return (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent;
|
| }
|
| };
|
| class CXFA_TraverseStrategy_ContentAreaContainerLayoutItem {
|
| public:
|
| - static inline CXFA_ContainerLayoutItemImpl* GetFirstChild(
|
| - CXFA_ContainerLayoutItemImpl* pLayoutItem) {
|
| - for (CXFA_LayoutItemImpl* pChildItem = pLayoutItem->m_pFirstChild;
|
| - pChildItem; pChildItem = pChildItem->m_pNextSibling) {
|
| + static inline CXFA_ContainerLayoutItem* GetFirstChild(
|
| + CXFA_ContainerLayoutItem* pLayoutItem) {
|
| + for (CXFA_LayoutItem* pChildItem = pLayoutItem->m_pFirstChild; pChildItem;
|
| + pChildItem = pChildItem->m_pNextSibling) {
|
| if (pChildItem->IsContentLayoutItem()) {
|
| continue;
|
| }
|
| - return (CXFA_ContainerLayoutItemImpl*)pChildItem;
|
| + return (CXFA_ContainerLayoutItem*)pChildItem;
|
| }
|
| return NULL;
|
| }
|
| - static inline CXFA_ContainerLayoutItemImpl* GetNextSibling(
|
| - CXFA_ContainerLayoutItemImpl* pLayoutItem) {
|
| - for (CXFA_LayoutItemImpl* pChildItem = pLayoutItem->m_pNextSibling;
|
| - pChildItem; pChildItem = pChildItem->m_pNextSibling) {
|
| + static inline CXFA_ContainerLayoutItem* GetNextSibling(
|
| + CXFA_ContainerLayoutItem* pLayoutItem) {
|
| + for (CXFA_LayoutItem* pChildItem = pLayoutItem->m_pNextSibling; pChildItem;
|
| + pChildItem = pChildItem->m_pNextSibling) {
|
| if (pChildItem->IsContentLayoutItem()) {
|
| continue;
|
| }
|
| - return (CXFA_ContainerLayoutItemImpl*)pChildItem;
|
| + return (CXFA_ContainerLayoutItem*)pChildItem;
|
| }
|
| return NULL;
|
| }
|
| - static inline CXFA_ContainerLayoutItemImpl* GetParent(
|
| - CXFA_ContainerLayoutItemImpl* pLayoutItem) {
|
| - return (CXFA_ContainerLayoutItemImpl*)pLayoutItem->m_pParent;
|
| + static inline CXFA_ContainerLayoutItem* GetParent(
|
| + CXFA_ContainerLayoutItem* pLayoutItem) {
|
| + return (CXFA_ContainerLayoutItem*)pLayoutItem->m_pParent;
|
| }
|
| };
|
| class CXFA_TraverseStrategy_ContentLayoutItem {
|
| public:
|
| - static inline CXFA_ContentLayoutItemImpl* GetFirstChild(
|
| - CXFA_ContentLayoutItemImpl* pLayoutItem) {
|
| - return (CXFA_ContentLayoutItemImpl*)pLayoutItem->m_pFirstChild;
|
| + static inline CXFA_ContentLayoutItem* GetFirstChild(
|
| + CXFA_ContentLayoutItem* pLayoutItem) {
|
| + return (CXFA_ContentLayoutItem*)pLayoutItem->m_pFirstChild;
|
| }
|
| - static inline CXFA_ContentLayoutItemImpl* GetNextSibling(
|
| - CXFA_ContentLayoutItemImpl* pLayoutItem) {
|
| - return (CXFA_ContentLayoutItemImpl*)pLayoutItem->m_pNextSibling;
|
| + static inline CXFA_ContentLayoutItem* GetNextSibling(
|
| + CXFA_ContentLayoutItem* pLayoutItem) {
|
| + return (CXFA_ContentLayoutItem*)pLayoutItem->m_pNextSibling;
|
| }
|
| - static inline CXFA_ContentLayoutItemImpl* GetParent(
|
| - CXFA_ContentLayoutItemImpl* pLayoutItem) {
|
| - return (CXFA_ContentLayoutItemImpl*)pLayoutItem->m_pParent;
|
| + static inline CXFA_ContentLayoutItem* GetParent(
|
| + CXFA_ContentLayoutItem* pLayoutItem) {
|
| + return (CXFA_ContentLayoutItem*)pLayoutItem->m_pParent;
|
| }
|
| };
|
| FX_DWORD XFA_GetRelevant(CXFA_Node* pFormItem, FX_DWORD dwParentRelvant);
|
| -void XFA_ReleaseLayoutItem(CXFA_LayoutItemImpl* pLayoutItem);
|
| +void XFA_ReleaseLayoutItem(CXFA_LayoutItem* pLayoutItem);
|
| #endif
|
|
|