From 09e139e231d1a94bd99ac295f3d66cb26c54ea16 Mon Sep 17 00:00:00 2001 From: weili Date: Mon, 23 May 2016 11:51:15 -0700 Subject: Remove unused class CXFA_FFDocWidgetIterator This class is not used anywhere. Also there are no implementation of its member functions except MoveToNext() function which was implemented wrong -- direct return in a while loop? BUG=pdfium:29 Review-Url: https://codereview.chromium.org/2007623002 --- xfa/fxfa/app/xfa_ffdocview.cpp | 51 +--------------------------------------- xfa/fxfa/include/xfa_ffdocview.h | 21 ----------------- 2 files changed, 1 insertion(+), 71 deletions(-) diff --git a/xfa/fxfa/app/xfa_ffdocview.cpp b/xfa/fxfa/app/xfa_ffdocview.cpp index 131e8cd82f..beb7dec1a3 100644 --- a/xfa/fxfa/app/xfa_ffdocview.cpp +++ b/xfa/fxfa/app/xfa_ffdocview.cpp @@ -309,13 +309,7 @@ CXFA_FFWidgetHandler* CXFA_FFDocView::GetWidgetHandler() { } return m_pWidgetHandler; } -IXFA_WidgetIterator* CXFA_FFDocView::CreateWidgetIterator() { - CXFA_Node* pFormRoot = GetRootSubform(); - if (!pFormRoot) { - return NULL; - } - return new CXFA_FFDocWidgetIterator(this, pFormRoot); -} + CXFA_WidgetAccIterator* CXFA_FFDocView::CreateWidgetAccIterator( XFA_WIDGETORDER eOrder) { CXFA_Node* pFormRoot = GetRootSubform(); @@ -809,49 +803,6 @@ CXFA_Node* CXFA_FFDocView::GetRootSubform() { } return pFormPacketNode->GetFirstChildByClass(XFA_ELEMENT_Subform); } -CXFA_FFDocWidgetIterator::CXFA_FFDocWidgetIterator(CXFA_FFDocView* pDocView, - CXFA_Node* pTravelRoot) - : m_ContentIterator(pTravelRoot) { - m_pDocView = pDocView; - m_pCurWidget = NULL; -} -CXFA_FFDocWidgetIterator::~CXFA_FFDocWidgetIterator() {} -void CXFA_FFDocWidgetIterator::Reset() { - m_ContentIterator.Reset(); - m_pCurWidget = NULL; -} -CXFA_FFWidget* CXFA_FFDocWidgetIterator::MoveToFirst() { - return NULL; -} -CXFA_FFWidget* CXFA_FFDocWidgetIterator::MoveToLast() { - return NULL; -} -CXFA_FFWidget* CXFA_FFDocWidgetIterator::MoveToNext() { - CXFA_Node* pItem = m_pCurWidget ? m_ContentIterator.MoveToNext() - : m_ContentIterator.GetCurrent(); - while (pItem) { - if (CXFA_WidgetAcc* pAcc = (CXFA_WidgetAcc*)pItem->GetWidgetData()) { - while ((m_pCurWidget = pAcc->GetNextWidget(NULL))) { - if (!m_pCurWidget->IsLoaded() && - (m_pCurWidget->GetStatus() & XFA_WidgetStatus_Visible)) { - m_pCurWidget->LoadWidget(); - } - return m_pCurWidget; - } - } - pItem = m_ContentIterator.MoveToNext(); - } - return NULL; -} -CXFA_FFWidget* CXFA_FFDocWidgetIterator::MoveToPrevious() { - return NULL; -} -CXFA_FFWidget* CXFA_FFDocWidgetIterator::GetCurrentWidget() { - return NULL; -} -FX_BOOL CXFA_FFDocWidgetIterator::SetCurrentWidget(CXFA_FFWidget* hWidget) { - return FALSE; -} CXFA_WidgetAccIterator::CXFA_WidgetAccIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot) diff --git a/xfa/fxfa/include/xfa_ffdocview.h b/xfa/fxfa/include/xfa_ffdocview.h index 2117b91589..b8ff562940 100644 --- a/xfa/fxfa/include/xfa_ffdocview.h +++ b/xfa/fxfa/include/xfa_ffdocview.h @@ -52,7 +52,6 @@ class CXFA_FFDocView { int32_t ProcessWidgetEvent(CXFA_EventParam* pParam, CXFA_WidgetAcc* pWidgetAcc = nullptr); CXFA_FFWidgetHandler* GetWidgetHandler(); - IXFA_WidgetIterator* CreateWidgetIterator(); CXFA_WidgetAccIterator* CreateWidgetAccIterator( XFA_WIDGETORDER eOrder = XFA_WIDGETORDER_PreOrder); CXFA_FFWidget* GetFocusWidget(); @@ -129,26 +128,6 @@ class CXFA_FFDocView { friend class CXFA_FFNotify; }; -class CXFA_FFDocWidgetIterator : public IXFA_WidgetIterator { - public: - CXFA_FFDocWidgetIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot); - ~CXFA_FFDocWidgetIterator() override; - - // IXFA_WidgetIterator: - void Reset() override; - CXFA_FFWidget* MoveToFirst() override; - CXFA_FFWidget* MoveToLast() override; - CXFA_FFWidget* MoveToNext() override; - CXFA_FFWidget* MoveToPrevious() override; - CXFA_FFWidget* GetCurrentWidget() override; - FX_BOOL SetCurrentWidget(CXFA_FFWidget* hWidget) override; - - protected: - CXFA_ContainerIterator m_ContentIterator; - CXFA_FFDocView* m_pDocView; - CXFA_FFWidget* m_pCurWidget; -}; - class CXFA_WidgetAccIterator { public: CXFA_WidgetAccIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot); -- cgit v1.2.3