From 18d0aafda2d4984f510f4f679bfc5393c2c8a81b Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 5 Aug 2015 10:11:22 -0700 Subject: Merge to XFA: FPDF_Creator can only create file through callbacks. (cherry picked from commit 5cd398545141226f082b2f757f23c73303058a83) Original Review URL: https://codereview.chromium.org/1264423003 . TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1275623002 . --- core/include/fpdfapi/fpdf_serial.h | 9 +-------- core/include/fxcrt/fx_basic.h | 6 ------ core/include/fxcrt/fx_stream.h | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) (limited to 'core/include') diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h index efa30f646b..0e317ff6d9 100644 --- a/core/include/fpdfapi/fpdf_serial.h +++ b/core/include/fpdfapi/fpdf_serial.h @@ -110,22 +110,15 @@ class CPDF_PageArchiveLoader : public CPDF_ObjArchiveLoader { #define FPDFCREATE_NO_ORIGINAL 2 #define FPDFCREATE_PROGRESSIVE 4 #define FPDFCREATE_OBJECTSTREAM 8 + class CPDF_Creator { public: CPDF_Creator(CPDF_Document* pDoc); - ~CPDF_Creator(); void RemoveSecurity(); - - FX_BOOL Create(const FX_WCHAR* filename, FX_DWORD flags = 0); - - FX_BOOL Create(const FX_CHAR* filename, FX_DWORD flags = 0); - FX_BOOL Create(IFX_StreamWrite* pFile, FX_DWORD flags = 0); - int32_t Continue(IFX_Pause* pPause = NULL); - FX_BOOL SetFileVersion(int32_t fileVersion = 17); protected: diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 0079acdd5e..d93d3f7193 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -226,18 +226,12 @@ class CFX_FileBufferArchive : public IFX_BufferArchive { ~CFX_FileBufferArchive() override; void Clear() override; - FX_BOOL AttachFile(IFX_StreamWrite* pFile, FX_BOOL bTakeover = FALSE); - FX_BOOL AttachFile(const FX_WCHAR* filename); - - FX_BOOL AttachFile(const FX_CHAR* filename); - private: FX_BOOL DoWork(const void* pBuf, size_t size) override; IFX_StreamWrite* m_pFile; - FX_BOOL m_bTakeover; }; diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h index e51c2bd244..f872e3334b 100644 --- a/core/include/fxcrt/fx_stream.h +++ b/core/include/fxcrt/fx_stream.h @@ -77,8 +77,6 @@ class IFX_FileWrite : public IFX_StreamWrite { return WriteBlock(pData, GetSize(), size); } }; -IFX_FileWrite* FX_CreateFileWrite(const FX_CHAR* filename); -IFX_FileWrite* FX_CreateFileWrite(const FX_WCHAR* filename); class IFX_StreamRead { public: virtual ~IFX_StreamRead() {} -- cgit v1.2.3