From 4997b22f84307521a62838f874928bf56cd3423c Mon Sep 17 00:00:00 2001 From: thestig Date: Tue, 7 Jun 2016 10:46:22 -0700 Subject: Get rid of NULLs in core/ Review-Url: https://codereview.chromium.org/2032613003 --- core/fpdfdoc/include/cpdf_variabletext.h | 14 +++++++------- core/fpdfdoc/include/fpdf_doc.h | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'core/fpdfdoc/include') diff --git a/core/fpdfdoc/include/cpdf_variabletext.h b/core/fpdfdoc/include/cpdf_variabletext.h index faa5036469..06b41f186c 100644 --- a/core/fpdfdoc/include/cpdf_variabletext.h +++ b/core/fpdfdoc/include/cpdf_variabletext.h @@ -115,20 +115,20 @@ class CPDF_VariableText : private CPDF_EditContainer { void ResetAll(); void SetText(const FX_WCHAR* text, int32_t charset = 1, - const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL); + const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr); CPVT_WordPlace InsertWord(const CPVT_WordPlace& place, uint16_t word, int32_t charset = 1, - const CPVT_WordProps* pWordProps = NULL); + const CPVT_WordProps* pWordProps = nullptr); CPVT_WordPlace InsertSection(const CPVT_WordPlace& place, - const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL); + const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr); CPVT_WordPlace InsertText(const CPVT_WordPlace& place, const FX_WCHAR* text, int32_t charset = 1, - const CPVT_SecProps* pSecProps = NULL, - const CPVT_WordProps* pWordProps = NULL); + const CPVT_SecProps* pSecProps = nullptr, + const CPVT_WordProps* pWordProps = nullptr); CPVT_WordPlace DeleteWords(const CPVT_WordRange& PlaceRange); CPVT_WordPlace DeleteWord(const CPVT_WordPlace& place); CPVT_WordPlace BackSpaceWord(const CPVT_WordPlace& place); diff --git a/core/fpdfdoc/include/fpdf_doc.h b/core/fpdfdoc/include/fpdf_doc.h index 339182c19b..a70a24c1e3 100644 --- a/core/fpdfdoc/include/fpdf_doc.h +++ b/core/fpdfdoc/include/fpdf_doc.h @@ -44,7 +44,6 @@ class CPDF_Page; class CPDF_PageObject; class CPDF_RenderContext; class CPDF_RenderOptions; -class CPDF_ViewerPreferences; class CXML_Element; class IPDF_FormNotify; @@ -899,6 +898,8 @@ class CPDF_ViewerPreferences { CFX_ByteString Duplex() const; protected: + CPDF_Dictionary* GetViewerPreferences() const; + CPDF_Document* const m_pDoc; }; -- cgit v1.2.3