From 4ecf9a855205d33491adf59c86e81548321542ee Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 11 Dec 2017 14:34:58 +0000 Subject: Get rid of default ctors for CPDF_Action and CPDF_AAction. Change-Id: I45bac6e1b3fb9ae90feff1dc65c716beb2cab4c4 Reviewed-on: https://pdfium-review.googlesource.com/20771 Commit-Queue: dsinclair Reviewed-by: dsinclair --- core/fpdfdoc/cpdf_action.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'core/fpdfdoc/cpdf_action.cpp') diff --git a/core/fpdfdoc/cpdf_action.cpp b/core/fpdfdoc/cpdf_action.cpp index a3e2e23baf..383f328b9f 100644 --- a/core/fpdfdoc/cpdf_action.cpp +++ b/core/fpdfdoc/cpdf_action.cpp @@ -21,8 +21,6 @@ const char* const g_sATypes[] = { } // namespace -CPDF_Action::CPDF_Action() : CPDF_Action(nullptr) {} - CPDF_Action::CPDF_Action(CPDF_Dictionary* pDict) : m_pDict(pDict) {} CPDF_Action::CPDF_Action(const CPDF_Action& that) = default; @@ -128,14 +126,14 @@ size_t CPDF_Action::GetSubActionsCount() const { CPDF_Action CPDF_Action::GetSubAction(size_t iIndex) const { if (!m_pDict || !m_pDict->KeyExist("Next")) - return CPDF_Action(); + return CPDF_Action(nullptr); CPDF_Object* pNext = m_pDict->GetDirectObjectFor("Next"); + if (CPDF_Array* pArray = ToArray(pNext)) + return CPDF_Action(pArray->GetDictAt(iIndex)); if (CPDF_Dictionary* pDict = ToDictionary(pNext)) { if (iIndex == 0) return CPDF_Action(pDict); - } else if (CPDF_Array* pArray = ToArray(pNext)) { - return CPDF_Action(pArray->GetDictAt(iIndex)); } - return CPDF_Action(); + return CPDF_Action(nullptr); } -- cgit v1.2.3