From 09d33bcd82a82cb55039d41651df13e17d6c3e59 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 19 Aug 2015 09:49:24 -0700 Subject: Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch). New manual edits: two unused members deleted, one adapted. fde_csscache.cpp fde_csscache.h fpdfxfa_doc.h fx_ge_fontmap.cpp (cherry picked from commit 1d9dbd53b205b2b4d9e75a7eeb95e80837917ea3) (cherry picked from commit cb4d0ea68308e3c51a6ba9551b393bb2f639afc4) (cherry picked from commit 9cf44c2ed09a8b2ff243eb6dbb72a8cceae1b5ff) (cherry picked from commit 2a2a6aa7f51352fc481e78f6ad9d41f2738bcc48) (cherry picked from commit ce4ffb8183af3fa2bb5133f0f7370a88e064c516) Original Review URL: https://codereview.chromium.org/1297723002 . R=thestig@chromium.org Review URL: https://codereview.chromium.org/1301793002 . --- fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'fpdfsdk/include/fpdfxfa') diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h index 27e7a91cd5..1ddb99064f 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h @@ -40,7 +40,6 @@ class CPDFXFA_Document : public IXFA_DocProvider { void FXRect2PDFRect(const CFX_RectF& fxRectF, CPDF_Rect& pdfRect); - public: virtual void SetChangeMark(IXFA_Doc* hDoc); virtual FX_BOOL GetChangeMark(IXFA_Doc* hDoc); // used in dynamic xfa, dwFlags refer to XFA_INVALIDATE_XXX macros. @@ -220,16 +219,9 @@ class CPDFXFA_Document : public IXFA_DocProvider { IXFA_Doc* m_pXFADoc; IXFA_DocView* m_pXFADocView; CFX_ArrayTemplate m_XFAPageList; - CPDFSDK_Document* m_pSDKDoc; CPDFXFA_App* m_pApp; - - CFX_MapByteStringToPtr m_XfaGlobalProperty; - - CFX_MapByteStringToPtr m_ValueMap; - IFXJS_Context* m_pJSContext; - int m_iDocType; }; -- cgit v1.2.3