Index: xfa/src/fxfa/src/app/xfa_ffpageview.cpp |
diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp |
index 72ad13dd17af6b64e2f4fe86f1e5d12913e62e64..32d749bc0114d4e1213c6c7d5cd1e633c5f7966a 100644 |
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp |
+++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp |
@@ -18,9 +18,10 @@ |
#include "xfa_ffimageedit.h" |
#include "xfa_fftextedit.h" |
CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea) |
- : CXFA_ContainerLayoutItemImpl(pPageArea), |
+ : CXFA_ContainerLayoutItem(pPageArea), |
m_pDocView(pDocView), |
- m_bLoaded(FALSE) {} |
+ m_bLoaded(FALSE) { |
+} |
CXFA_FFPageView::~CXFA_FFPageView() {} |
IXFA_DocView* CXFA_FFPageView::GetDocView() { |
return m_pDocView; |
@@ -119,7 +120,7 @@ CXFA_FFPageWidgetIterator::CXFA_FFPageWidgetIterator(CXFA_FFPageView* pPageView, |
FX_DWORD dwFilter) { |
m_pPageView = pPageView; |
m_dwFilter = dwFilter; |
- m_sIterator.Init((CXFA_LayoutItemImpl*)pPageView->GetLayoutPage()); |
+ m_sIterator.Init((CXFA_LayoutItem*)pPageView->GetLayoutPage()); |
m_bIgnorerelevant = ((CXFA_FFDoc*)m_pPageView->GetDocView()->GetDoc()) |
->GetXFADoc() |
->GetCurVersionMode() < XFA_VERSION_205; |
@@ -130,7 +131,7 @@ void CXFA_FFPageWidgetIterator::Reset() { |
} |
IXFA_Widget* CXFA_FFPageWidgetIterator::MoveToFirst() { |
m_sIterator.Reset(); |
- for (CXFA_LayoutItemImpl* pLayoutItem = m_sIterator.GetCurrent(); pLayoutItem; |
+ for (CXFA_LayoutItem* pLayoutItem = m_sIterator.GetCurrent(); pLayoutItem; |
pLayoutItem = m_sIterator.MoveToNext()) { |
if (IXFA_Widget* hWidget = GetWidget(pLayoutItem)) { |
return hWidget; |
@@ -143,7 +144,7 @@ IXFA_Widget* CXFA_FFPageWidgetIterator::MoveToLast() { |
return MoveToPrevious(); |
} |
IXFA_Widget* CXFA_FFPageWidgetIterator::MoveToNext() { |
- for (CXFA_LayoutItemImpl* pLayoutItem = m_sIterator.MoveToNext(); pLayoutItem; |
+ for (CXFA_LayoutItem* pLayoutItem = m_sIterator.MoveToNext(); pLayoutItem; |
pLayoutItem = m_sIterator.MoveToNext()) { |
if (IXFA_Widget* hWidget = GetWidget(pLayoutItem)) { |
return hWidget; |
@@ -152,7 +153,7 @@ IXFA_Widget* CXFA_FFPageWidgetIterator::MoveToNext() { |
return NULL; |
} |
IXFA_Widget* CXFA_FFPageWidgetIterator::MoveToPrevious() { |
- for (CXFA_LayoutItemImpl* pLayoutItem = m_sIterator.MoveToPrev(); pLayoutItem; |
+ for (CXFA_LayoutItem* pLayoutItem = m_sIterator.MoveToPrev(); pLayoutItem; |
pLayoutItem = m_sIterator.MoveToPrev()) { |
if (IXFA_Widget* hWidget = GetWidget(pLayoutItem)) { |
return hWidget; |
@@ -161,7 +162,7 @@ IXFA_Widget* CXFA_FFPageWidgetIterator::MoveToPrevious() { |
return NULL; |
} |
IXFA_Widget* CXFA_FFPageWidgetIterator::GetCurrentWidget() { |
- CXFA_LayoutItemImpl* pLayoutItem = m_sIterator.GetCurrent(); |
+ CXFA_LayoutItem* pLayoutItem = m_sIterator.GetCurrent(); |
return pLayoutItem ? XFA_GetWidgetFromLayoutItem(pLayoutItem) : NULL; |
} |
FX_BOOL CXFA_FFPageWidgetIterator::SetCurrentWidget(IXFA_Widget* hWidget) { |
@@ -169,7 +170,7 @@ FX_BOOL CXFA_FFPageWidgetIterator::SetCurrentWidget(IXFA_Widget* hWidget) { |
return pWidget && m_sIterator.SetCurrent(pWidget); |
} |
IXFA_Widget* CXFA_FFPageWidgetIterator::GetWidget( |
- CXFA_LayoutItemImpl* pLayoutItem) { |
+ CXFA_LayoutItem* pLayoutItem) { |
if (CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pLayoutItem)) { |
if (!XFA_PageWidgetFilter(pWidget, m_dwFilter, FALSE, m_bIgnorerelevant)) { |
return NULL; |
@@ -332,16 +333,16 @@ static int32_t XFA_TabOrderWidgetComparator(const void* phWidget1, |
} |
void CXFA_FFTabOrderPageWidgetIterator::OrderContainer( |
CXFA_LayoutItemIterator* sIterator, |
- CXFA_LayoutItemImpl* pContainerItem, |
+ CXFA_LayoutItem* pContainerItem, |
CXFA_TabParam* pContainer, |
FX_BOOL& bCurrentItem, |
FX_BOOL& bContentArea, |
FX_BOOL bMarsterPage) { |
CFX_PtrArray tabParams; |
- CXFA_LayoutItemImpl* pSearchItem = sIterator->MoveToNext(); |
+ CXFA_LayoutItem* pSearchItem = sIterator->MoveToNext(); |
while (pSearchItem) { |
FX_BOOL bIsContentLayoutItem = |
- ((CXFA_LayoutItemImpl*)pSearchItem)->IsContentLayoutItem(); |
+ ((CXFA_LayoutItem*)pSearchItem)->IsContentLayoutItem(); |
if (!bIsContentLayoutItem) { |
bContentArea = TRUE; |
pSearchItem = sIterator->MoveToNext(); |
@@ -393,7 +394,7 @@ void CXFA_FFTabOrderPageWidgetIterator::OrderContainer( |
void CXFA_FFTabOrderPageWidgetIterator::CreateSpaceOrderWidgetArray( |
CXFA_WidgetArray& WidgetArray) { |
CXFA_LayoutItemIterator sIterator; |
- sIterator.Init((CXFA_LayoutItemImpl*)m_pPageView->GetLayoutPage()); |
+ sIterator.Init((CXFA_LayoutItem*)m_pPageView->GetLayoutPage()); |
CXFA_TabParam* pParam = new CXFA_TabParam; |
FX_BOOL bCurrentItem = FALSE; |
FX_BOOL bContentArea = FALSE; |
@@ -412,7 +413,7 @@ void CXFA_FFTabOrderPageWidgetIterator::CreateSpaceOrderWidgetArray( |
delete pParam; |
} |
CXFA_FFWidget* CXFA_FFTabOrderPageWidgetIterator::GetWidget( |
- CXFA_LayoutItemImpl* pLayoutItem) { |
+ CXFA_LayoutItem* pLayoutItem) { |
if (CXFA_FFWidget* pWidget = XFA_GetWidgetFromLayoutItem(pLayoutItem)) { |
if (!pWidget->IsLoaded() && |
(pWidget->GetStatus() & XFA_WIDGETSTATUS_Visible)) { |