diff options
author | Lei Zhang <thestig@chromium.org> | 2018-04-17 17:01:52 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-04-17 17:01:52 +0000 |
commit | 2617056df6d6e1d0f17031f0c9db09f9192cb0fa (patch) | |
tree | 3e286a9d2f7c754ca8521ea878d7a1c795bea82f /core/fpdfdoc | |
parent | b7973bb5a0ad2f83a71362d601a928964559004a (diff) | |
download | pdfium-2617056df6d6e1d0f17031f0c9db09f9192cb0fa.tar.xz |
Add constants for PDF 1.7 spec, table 3.4.
Add constants/stream_dict_common.h. The header lists all the constants
in the table in the same order. Constants that are not used at all are
commented out.
BUG=pdfium:1049
Change-Id: I6539090e0ad56319ea628883e388aeacef044e52
Reviewed-on: https://pdfium-review.googlesource.com/29090
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fpdfdoc')
-rw-r--r-- | core/fpdfdoc/cpdf_action.cpp | 6 | ||||
-rw-r--r-- | core/fpdfdoc/cpdf_filespec.cpp | 8 | ||||
-rw-r--r-- | core/fpdfdoc/cpdf_interform.cpp | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/core/fpdfdoc/cpdf_action.cpp b/core/fpdfdoc/cpdf_action.cpp index 383f328b9f..4ac86fe104 100644 --- a/core/fpdfdoc/cpdf_action.cpp +++ b/core/fpdfdoc/cpdf_action.cpp @@ -6,6 +6,7 @@ #include "core/fpdfdoc/cpdf_action.h" +#include "constants/stream_dict_common.h" #include "core/fpdfapi/parser/cpdf_array.h" #include "core/fpdfapi/parser/cpdf_document.h" #include "core/fpdfdoc/cpdf_filespec.h" @@ -70,14 +71,15 @@ WideString CPDF_Action::GetFilePath() const { return WideString(); } - CPDF_Object* pFile = m_pDict->GetDirectObjectFor("F"); + CPDF_Object* pFile = m_pDict->GetDirectObjectFor(pdfium::stream::kF); if (pFile) return CPDF_FileSpec(pFile).GetFileName(); if (type == "Launch") { CPDF_Dictionary* pWinDict = m_pDict->GetDictFor("Win"); if (pWinDict) { - return WideString::FromLocal(pWinDict->GetStringFor("F").AsStringView()); + return WideString::FromLocal( + pWinDict->GetStringFor(pdfium::stream::kF).AsStringView()); } } return WideString(); diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp index 2f999bcf4e..e741ac61ce 100644 --- a/core/fpdfdoc/cpdf_filespec.cpp +++ b/core/fpdfdoc/cpdf_filespec.cpp @@ -8,6 +8,7 @@ #include <vector> +#include "constants/stream_dict_common.h" #include "core/fpdfapi/parser/cpdf_dictionary.h" #include "core/fpdfapi/parser/cpdf_name.h" #include "core/fpdfapi/parser/cpdf_object.h" @@ -94,8 +95,8 @@ WideString CPDF_FileSpec::GetFileName() const { if (CPDF_Dictionary* pDict = m_pObj->AsDictionary()) { csFileName = pDict->GetUnicodeTextFor("UF"); if (csFileName.IsEmpty()) { - csFileName = - WideString::FromLocal(pDict->GetStringFor("F").AsStringView()); + csFileName = WideString::FromLocal( + pDict->GetStringFor(pdfium::stream::kF).AsStringView()); } if (pDict->GetStringFor("FS") == "URL") return csFileName; @@ -187,7 +188,8 @@ void CPDF_FileSpec::SetFileName(const WideString& wsFileName) { if (m_pObj->IsString()) { m_pObj->SetString(ByteString::FromUnicode(wsStr)); } else if (CPDF_Dictionary* pDict = m_pObj->AsDictionary()) { - pDict->SetNewFor<CPDF_String>("F", ByteString::FromUnicode(wsStr), false); + pDict->SetNewFor<CPDF_String>(pdfium::stream::kF, + ByteString::FromUnicode(wsStr), false); pDict->SetNewFor<CPDF_String>("UF", PDF_EncodeText(wsStr), false); } } diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp index 6c53c971d8..6bf72fd5ef 100644 --- a/core/fpdfdoc/cpdf_interform.cpp +++ b/core/fpdfdoc/cpdf_interform.cpp @@ -9,6 +9,7 @@ #include <utility> #include <vector> +#include "constants/stream_dict_common.h" #include "core/fpdfapi/font/cpdf_font.h" #include "core/fpdfapi/font/cpdf_fontencoding.h" #include "core/fpdfapi/page/cpdf_page.h" @@ -1117,7 +1118,7 @@ std::unique_ptr<CFDF_Document> CPDF_InterForm::ExportToFDF( if (bSimpleFileSpec) { WideString wsFilePath = CPDF_FileSpec::EncodeFileName(pdf_path); pMainDict->SetNewFor<CPDF_String>( - "F", ByteString::FromUnicode(wsFilePath), false); + pdfium::stream::kF, ByteString::FromUnicode(wsFilePath), false); pMainDict->SetNewFor<CPDF_String>("UF", PDF_EncodeText(wsFilePath), false); } else { |