From a725bc9a3525256976c112b2b5a429a119cf9b69 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 16 Oct 2015 14:45:16 -0700 Subject: 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 . --- core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp') 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) { -- cgit v1.2.3