summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-05-18 13:16:12 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-18 13:16:12 -0700
commitcbfef5772c52fbd3378905a61fc9432da1515433 (patch)
treebe4c25e41d2467609612232a92e598ccd9baa7eb /fpdfsdk
parent1763f62972a3ebf080f645899a8de79b00dbfb23 (diff)
downloadpdfium-cbfef5772c52fbd3378905a61fc9432da1515433.tar.xz
Cleanup XFA_HASHCODE usage.
This CL cleans up several uses of XFA_HASHCODE. The defines have been converted into an enum. For the SavePackage call the type is now used as the param instead of a string. The callers pass in the correct type instead of doing an internal conversion. The GetXFAObject accepting a string was removed as it was unused. The other variant was changed to accept the XFA_HashCode type instead of uint32_t. GetPackageData was removed as it is unused. Review-Url: https://codereview.chromium.org/1989313002
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/fpdfsave.cpp8
-rw-r--r--fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp26
2 files changed, 13 insertions, 21 deletions
diff --git a/fpdfsdk/fpdfsave.cpp b/fpdfsdk/fpdfsave.cpp
index 84de668dde..7b08194bf4 100644
--- a/fpdfsdk/fpdfsave.cpp
+++ b/fpdfsdk/fpdfsave.cpp
@@ -174,8 +174,8 @@ bool SaveXFADocumentData(CPDFXFA_Document* pDocument,
// L"datasets"
{
ScopedFileStream pDsfileWrite(FX_CreateMemoryStream());
- if (pXFADocView->GetDoc()->SavePackage(CFX_WideStringC(L"datasets"),
- pDsfileWrite.get()) &&
+ if (pXFADocView->GetDoc()->SavePackage(XFA_HASHCODE_Datasets,
+ pDsfileWrite.get(), nullptr) &&
pDsfileWrite->GetSize() > 0) {
// Datasets
pContext->UpdateChecksum(pDsfileWrite.get());
@@ -198,8 +198,8 @@ bool SaveXFADocumentData(CPDFXFA_Document* pDocument,
// L"form"
{
ScopedFileStream pfileWrite(FX_CreateMemoryStream());
- if (pXFADocView->GetDoc()->SavePackage(CFX_WideStringC(L"form"),
- pfileWrite.get(), pContext.get()) &&
+ if (pXFADocView->GetDoc()->SavePackage(XFA_HASHCODE_Form, pfileWrite.get(),
+ pContext.get()) &&
pfileWrite->GetSize() > 0) {
CPDF_Dictionary* pDataDict = new CPDF_Dictionary;
if (iFormIndex != -1) {
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
index 29d3d5fc0a..85a1f16f5d 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp
@@ -660,10 +660,8 @@ void CPDFXFA_Document::ExportData(CXFA_FFDoc* hDoc,
content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n";
fileWrite.WriteBlock(content.c_str(), fileWrite.GetSize(),
content.GetLength());
- CFX_WideStringC data(L"data");
- if (m_pXFADocView->GetDoc()->SavePackage(data, &fileWrite)) {
- // Ignoring error.
- }
+ m_pXFADocView->GetDoc()->SavePackage(XFA_HASHCODE_Data, &fileWrite,
+ nullptr);
} else if (fileType == FXFA_SAVEAS_XDP) {
if (m_pPDFDoc == NULL)
return;
@@ -693,11 +691,11 @@ void CPDFXFA_Document::ExportData(CXFA_FFDoc* hDoc,
if (!pDirectObj->IsStream())
continue;
if (pPrePDFObj->GetString() == "form") {
- CFX_WideStringC form(L"form");
- m_pXFADocView->GetDoc()->SavePackage(form, &fileWrite);
+ m_pXFADocView->GetDoc()->SavePackage(XFA_HASHCODE_Form, &fileWrite,
+ nullptr);
} else if (pPrePDFObj->GetString() == "datasets") {
- CFX_WideStringC datasets(L"datasets");
- m_pXFADocView->GetDoc()->SavePackage(datasets, &fileWrite);
+ m_pXFADocView->GetDoc()->SavePackage(XFA_HASHCODE_Datasets, &fileWrite,
+ nullptr);
} else {
if (i == size - 1) {
CFX_WideString wPath = CFX_WideString::FromUTF16LE(
@@ -954,11 +952,9 @@ FX_BOOL CPDFXFA_Document::_ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler,
CFPDF_FileStream fileStream(pFileHandler);
if (fileType == FXFA_SAVEAS_XML) {
- CFX_WideString ws;
- ws.FromLocal("data");
const char* content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n";
fileStream.WriteBlock(content, 0, strlen(content));
- m_pXFADoc->SavePackage(ws.AsStringC(), &fileStream);
+ m_pXFADoc->SavePackage(XFA_HASHCODE_Data, &fileStream, nullptr);
} else if (fileType == FXFA_SAVEAS_XDP) {
if (flag == 0)
flag = FXFA_CONFIG | FXFA_TEMPLATE | FXFA_LOCALESET | FXFA_DATASETS |
@@ -1017,13 +1013,9 @@ FX_BOOL CPDFXFA_Document::_ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler,
if (pPrePDFObj->GetString() == "form" && !(flag & FXFA_FORM))
continue;
if (pPrePDFObj->GetString() == "form") {
- CFX_WideString ws;
- ws.FromLocal("form");
- m_pXFADoc->SavePackage(ws.AsStringC(), &fileStream);
+ m_pXFADoc->SavePackage(XFA_HASHCODE_Form, &fileStream, nullptr);
} else if (pPrePDFObj->GetString() == "datasets") {
- CFX_WideString ws;
- ws.FromLocal("datasets");
- m_pXFADoc->SavePackage(ws.AsStringC(), &fileStream);
+ m_pXFADoc->SavePackage(XFA_HASHCODE_Datasets, &fileStream, nullptr);
} else {
// PDF,creator.
}