From 08915150a3fb64aa1ebf9bdf20d1158a20b4266f Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 23 Jan 2018 15:22:54 +0000 Subject: Convert CXFA_WidgetAccIterator to CXFA_ReadyNodeIterator This CL converts the WidgetAcc iterator to return nodes in which the OnReady event has been fired. Change-Id: I5ec6809c1610ac3467019d8492121901d3845a37 Reviewed-on: https://pdfium-review.googlesource.com/23490 Reviewed-by: Ryan Harrison Commit-Queue: dsinclair --- fpdfsdk/fpdfsave.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'fpdfsdk/fpdfsave.cpp') diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp index b4d4a4107a..b95850f7b6 100644 --- a/fpdfsdk/fpdfsave.cpp +++ b/fpdfsdk/fpdfsave.cpp @@ -31,8 +31,8 @@ #include "xfa/fxfa/cxfa_ffapp.h" #include "xfa/fxfa/cxfa_ffdocview.h" #include "xfa/fxfa/cxfa_ffwidgethandler.h" +#include "xfa/fxfa/cxfa_readynodeiterator.h" #include "xfa/fxfa/cxfa_widgetacc.h" -#include "xfa/fxfa/cxfa_widgetacciterator.h" #include "xfa/fxfa/parser/cxfa_object.h" #endif @@ -205,12 +205,11 @@ bool SendPostSaveToXFADoc(CPDFXFA_Context* pContext) { return false; CXFA_FFWidgetHandler* pWidgetHandler = pXFADocView->GetWidgetHandler(); - std::unique_ptr pWidgetAccIterator = - pXFADocView->CreateWidgetAccIterator(); - while (CXFA_WidgetAcc* pWidgetAcc = pWidgetAccIterator->MoveToNext()) { + auto it = pXFADocView->CreateReadyNodeIterator(); + while (CXFA_Node* pNode = it->MoveToNext()) { CXFA_EventParam preParam; preParam.m_eType = XFA_EVENT_PostSave; - pWidgetHandler->ProcessEvent(pWidgetAcc->GetNode(), &preParam); + pWidgetHandler->ProcessEvent(pNode, &preParam); } pXFADocView->UpdateDocView(); pContext->ClearChangeMark(); @@ -227,12 +226,11 @@ bool SendPreSaveToXFADoc(CPDFXFA_Context* pContext, return true; CXFA_FFWidgetHandler* pWidgetHandler = pXFADocView->GetWidgetHandler(); - std::unique_ptr pWidgetAccIterator = - pXFADocView->CreateWidgetAccIterator(); - while (CXFA_WidgetAcc* pWidgetAcc = pWidgetAccIterator->MoveToNext()) { + auto it = pXFADocView->CreateReadyNodeIterator(); + while (CXFA_Node* pNode = it->MoveToNext()) { CXFA_EventParam preParam; preParam.m_eType = XFA_EVENT_PreSave; - pWidgetHandler->ProcessEvent(pWidgetAcc->GetNode(), &preParam); + pWidgetHandler->ProcessEvent(pNode, &preParam); } pXFADocView->UpdateDocView(); return SaveXFADocumentData(pContext, fileList); -- cgit v1.2.3