From 7023b8877475dda639a15d623b5a552f88a6812f Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 12 Apr 2018 13:54:39 +0000 Subject: Remove CXFA_DocumentParser::m_bDocumentParser flag This CL removes the import data behaviour as it was never called and cleans up the m_bDocumentParser flag as it will always be used in the true case. Change-Id: If90a0a55cc76f406e9987aa71580e90edeaa01ba Reviewed-on: https://pdfium-review.googlesource.com/30292 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/cxfa_ffdoc.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'xfa/fxfa/cxfa_ffdoc.cpp') diff --git a/xfa/fxfa/cxfa_ffdoc.cpp b/xfa/fxfa/cxfa_ffdoc.cpp index 24a8a04c03..9dc58adb9a 100644 --- a/xfa/fxfa/cxfa_ffdoc.cpp +++ b/xfa/fxfa/cxfa_ffdoc.cpp @@ -31,7 +31,6 @@ #include "xfa/fxfa/parser/cxfa_acrobat.h" #include "xfa/fxfa/parser/cxfa_acrobat7.h" #include "xfa/fxfa/parser/cxfa_dataexporter.h" -#include "xfa/fxfa/parser/cxfa_dataimporter.h" #include "xfa/fxfa/parser/cxfa_document.h" #include "xfa/fxfa/parser/cxfa_document_parser.h" #include "xfa/fxfa/parser/cxfa_dynamicrender.h" @@ -181,10 +180,7 @@ bool CXFA_FFDoc::ParseDoc(CPDF_Object* pElementXFA) { auto stream = pdfium::MakeRetain(xfaStreams); - // Note, we don't pass the document into the constructor as currently that - // triggers different behaviour in the parser. - CXFA_DocumentParser parser; - parser.SetFactory(m_pDocument.get()); + CXFA_DocumentParser parser(m_pDocument.get()); if (!parser.Parse(stream, XFA_PacketType::Xdp)) return false; @@ -406,9 +402,3 @@ bool CXFA_FFDoc::SavePackage(CXFA_Node* pNode, CXFA_DataExporter exporter; return exporter.Export(pFile, pNode ? pNode : GetXFADoc()->GetRoot()); } - -bool CXFA_FFDoc::ImportData(const RetainPtr& pStream, - bool bXDP) { - auto importer = pdfium::MakeUnique(m_pDocument.get()); - return importer->ImportData(pStream); -} -- cgit v1.2.3