summaryrefslogtreecommitdiff
path: root/core/fpdfdoc/include
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-06-07 10:46:22 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-07 10:46:23 -0700
commit4997b22f84307521a62838f874928bf56cd3423c (patch)
treead11d99ac0a491ee222e9d0a42ec3b6ad3354e2a /core/fpdfdoc/include
parent0687e76dc259c678b3f29a6608331f07ffd8f1e2 (diff)
downloadpdfium-4997b22f84307521a62838f874928bf56cd3423c.tar.xz
Get rid of NULLs in core/
Review-Url: https://codereview.chromium.org/2032613003
Diffstat (limited to 'core/fpdfdoc/include')
-rw-r--r--core/fpdfdoc/include/cpdf_variabletext.h14
-rw-r--r--core/fpdfdoc/include/fpdf_doc.h3
2 files changed, 9 insertions, 8 deletions
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;
};