diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-16 14:45:16 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-16 14:45:16 -0700 |
| commit | a725bc9a3525256976c112b2b5a429a119cf9b69 (patch) | |
| tree | c78495b35fd31cf69bcfb1ee2b5540ac35dc3982 /core/src/fpdfapi/fpdf_edit | |
| parent | 24e733ef26280268ac6ede6d73fac7475aedd1a9 (diff) | |
| download | pdfium-a725bc9a3525256976c112b2b5a429a119cf9b69.tar.xz | |
Merge to XFA: Declare PDF_GetStandardFontName() in the header.
R=tsepez@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1410043003 .
(cherry picked from commit 3d7d1d2f29e5fb099367a40822684d31f684fd62)
Review URL: https://codereview.chromium.org/1415453002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_edit')
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp index d0be5ec1f4..95eac538bb 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp @@ -1106,15 +1106,15 @@ CPDF_Dictionary* CPDF_Document::CreateNewPage(int iPage) { } return pDict; } -int _PDF_GetStandardFontName(CFX_ByteString& name); + CPDF_Font* CPDF_Document::AddStandardFont(const FX_CHAR* font, CPDF_FontEncoding* pEncoding) { CFX_ByteString name(font, -1); - if (_PDF_GetStandardFontName(name) < 0) { - return NULL; - } + if (PDF_GetStandardFontName(&name) < 0) + return nullptr; return GetPageData()->GetStandardFont(name, pEncoding); } + void CPDF_Document::DeletePage(int iPage) { CPDF_Dictionary* pRoot = GetRoot(); if (pRoot == NULL) { |