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/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp | 20 ------------------ core/src/fxcrt/fx_basic_buffer.cpp | 28 ------------------------- core/src/fxcrt/fx_extension.cpp | 6 ------ 3 files changed, 54 deletions(-) (limited to 'core/src') diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index 6f193071de..ff0539c61f 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -2016,26 +2016,6 @@ void CPDF_Creator::Clear() { m_pIDArray = NULL; } } -FX_BOOL CPDF_Creator::Create(const FX_CHAR* filename, FX_DWORD flags) { - if (!m_File.AttachFile(filename)) { - return FALSE; - } - FX_BOOL bRet = Create(flags); - if (!bRet || !(flags & FPDFCREATE_PROGRESSIVE)) { - Clear(); - } - return bRet; -} -FX_BOOL CPDF_Creator::Create(const FX_WCHAR* filename, FX_DWORD flags) { - if (!m_File.AttachFile(filename)) { - return FALSE; - } - FX_BOOL bRet = Create(flags); - if (!bRet || !(flags & FPDFCREATE_PROGRESSIVE)) { - Clear(); - } - return bRet; -} FX_BOOL CPDF_Creator::Create(IFX_StreamWrite* pFile, FX_DWORD flags) { if (!pFile) { return FALSE; diff --git a/core/src/fxcrt/fx_basic_buffer.cpp b/core/src/fxcrt/fx_basic_buffer.cpp index f2cc3de33d..40269e00c0 100644 --- a/core/src/fxcrt/fx_basic_buffer.cpp +++ b/core/src/fxcrt/fx_basic_buffer.cpp @@ -450,34 +450,6 @@ FX_BOOL CFX_FileBufferArchive::AttachFile(IFX_StreamWrite* pFile, m_bTakeover = bTakeover; return TRUE; } -FX_BOOL CFX_FileBufferArchive::AttachFile(const FX_WCHAR* filename) { - if (!filename) { - return FALSE; - } - if (m_pFile && m_bTakeover) { - m_pFile->Release(); - } - m_pFile = FX_CreateFileWrite(filename); - if (!m_pFile) { - return FALSE; - } - m_bTakeover = TRUE; - return TRUE; -} -FX_BOOL CFX_FileBufferArchive::AttachFile(const FX_CHAR* filename) { - if (!filename) { - return FALSE; - } - if (m_pFile && m_bTakeover) { - m_pFile->Release(); - } - m_pFile = FX_CreateFileWrite(filename); - if (!m_pFile) { - return FALSE; - } - m_bTakeover = TRUE; - return TRUE; -} FX_BOOL CFX_FileBufferArchive::DoWork(const void* pBuf, size_t size) { if (!m_pFile) { return FALSE; diff --git a/core/src/fxcrt/fx_extension.cpp b/core/src/fxcrt/fx_extension.cpp index 1ea05574e3..004e39d5e2 100644 --- a/core/src/fxcrt/fx_extension.cpp +++ b/core/src/fxcrt/fx_extension.cpp @@ -48,12 +48,6 @@ IFX_FileStream* FX_CreateFileStream(const FX_WCHAR* filename, } return FX_NEW CFX_CRTFileStream(pFA); } -IFX_FileWrite* FX_CreateFileWrite(const FX_CHAR* filename) { - return FX_CreateFileStream(filename, FX_FILEMODE_Truncate); -} -IFX_FileWrite* FX_CreateFileWrite(const FX_WCHAR* filename) { - return FX_CreateFileStream(filename, FX_FILEMODE_Truncate); -} IFX_FileRead* FX_CreateFileRead(const FX_CHAR* filename) { return FX_CreateFileStream(filename, FX_FILEMODE_ReadOnly); } -- cgit v1.2.3