diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-17 17:50:23 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-17 17:50:23 -0800 |
| commit | 0c0d8bd35decd8e97fb972a932abd111b545138c (patch) | |
| tree | 31ababf0085007560412309720bfbc9ac4f2b55c /core/include/fpdfdoc | |
| parent | c57e236578f923007fbcdac953625d46a569f213 (diff) | |
| download | pdfium-0c0d8bd35decd8e97fb972a932abd111b545138c.tar.xz | |
Make CPDF_InterForm::AddStandardFont take a non-const document pointer.
Instead of taking a const pointer, and then casting away the const-ness.
Also remove similar, but dead CPDF_InterForm methods.
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1456763003 .
Review URL: https://codereview.chromium.org/1456823002 .
Review URL: https://codereview.chromium.org/1452843005 .
(cherry picked from commit 9c62cadff466f26307bd06ed1e9df2c1b5f25a32)
(cherry picked from commit 447946588d6bbd4d5bc34477a09dd983285c507e)
(cherry picked from commit b2a4c976841863e89804a2643eebccf881c57584)
Review URL: https://codereview.chromium.org/1457703002 .
Diffstat (limited to 'core/include/fpdfdoc')
| -rw-r--r-- | core/include/fpdfdoc/fpdf_doc.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 478d6fbbdd..c270c78bcf 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -544,17 +544,7 @@ class CPDF_InterForm : public CFX_PrivateData { int iMinLen = 2, const FX_CHAR* csPrefix = ""); - static CPDF_Font* AddSystemDefaultFont(const CPDF_Document* pDocument); - - static CPDF_Font* AddSystemFont(const CPDF_Document* pDocument, - CFX_ByteString csFontName, - uint8_t iCharSet = 1); - - static CPDF_Font* AddSystemFont(const CPDF_Document* pDocument, - CFX_WideString csFontName, - uint8_t iCharSet = 1); - - static CPDF_Font* AddStandardFont(const CPDF_Document* pDocument, + static CPDF_Font* AddStandardFont(CPDF_Document* pDocument, CFX_ByteString csFontName); static CFX_ByteString GetNativeFont(uint8_t iCharSet, void* pLogFont = NULL); @@ -563,10 +553,9 @@ class CPDF_InterForm : public CFX_PrivateData { static uint8_t GetNativeCharSet(); - static CPDF_Font* AddNativeFont(uint8_t iCharSet, - const CPDF_Document* pDocument); + static CPDF_Font* AddNativeFont(uint8_t iCharSet, CPDF_Document* pDocument); - static CPDF_Font* AddNativeFont(const CPDF_Document* pDocument); + static CPDF_Font* AddNativeFont(CPDF_Document* pDocument); FX_BOOL ValidateFieldName(CFX_WideString& csNewFieldName, int iType); |