From cb798258c433bec7087948fcbfff14d1e7683006 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 17 Sep 2018 18:25:32 +0000 Subject: Fix final/protected conflicts. Classes marked |final| should not have |protected| members. In turn, "private field m_dwEncryptObjNum is not used" warning is produced. Change-Id: I51a96aca5a5f499381a6764d892962f7f2dc0327 Reviewed-on: https://pdfium-review.googlesource.com/42611 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- fpdfsdk/cpdfsdk_helpers.cpp | 2 +- fpdfsdk/fpdfxfa/cpdfxfa_context.h | 3 +-- fpdfsdk/fpdfxfa/cpdfxfa_page.h | 3 +-- fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h | 2 +- fpdfsdk/pwl/cpwl_scroll_bar.h | 6 ++---- 5 files changed, 6 insertions(+), 10 deletions(-) (limited to 'fpdfsdk') diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp index 0ec8d173ae..2d2d78aded 100644 --- a/fpdfsdk/cpdfsdk_helpers.cpp +++ b/fpdfsdk/cpdfsdk_helpers.cpp @@ -54,7 +54,7 @@ class FPDF_FileHandlerContext final : public IFX_SeekableStream { void SetPosition(FX_FILESIZE pos) { m_nCurPos = pos; } - protected: + private: explicit FPDF_FileHandlerContext(FPDF_FILEHANDLER* pFS); ~FPDF_FileHandlerContext() override; diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_context.h b/fpdfsdk/fpdfxfa/cpdfxfa_context.h index 887f06d431..1315375b58 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h @@ -93,7 +93,7 @@ class CPDFXFA_Context final : public CPDF_Document::Extension, std::unique_ptr NewTimerMgr() override; - protected: + private: friend class CPDFXFA_DocEnvironment; int GetOriginalPageCount() const { return m_nPageCount; } @@ -107,7 +107,6 @@ class CPDFXFA_Context final : public CPDF_Document::Extension, return &m_XFAPageList; } - private: CJS_Runtime* GetCJSRuntime() const; void CloseXFADoc(); diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_page.h b/fpdfsdk/fpdfxfa/cpdfxfa_page.h index 769bdaa792..90376222f4 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_page.h +++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h @@ -52,7 +52,7 @@ class CPDFXFA_Page final : public IPDF_Page { m_pXFAPageView = pPageView; } - protected: + private: // Refcounted class. CPDFXFA_Page(CPDFXFA_Context* pContext, int page_index); ~CPDFXFA_Page() override; @@ -60,7 +60,6 @@ class CPDFXFA_Page final : public IPDF_Page { bool LoadPDFPage(); bool LoadXFAPageView(); - private: RetainPtr m_pPDFPage; CXFA_FFPageView* m_pXFAPageView; UnownedPtr const m_pContext; diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h index 8bca0bdd28..770b0e2d97 100644 --- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h +++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h @@ -26,7 +26,7 @@ class CXFA_FWLAdapterTimerMgr final : public IFWL_AdapterTimerMgr { CFWL_TimerInfo** pTimerInfo) override; void Stop(CFWL_TimerInfo* pTimerInfo) override; - protected: + private: static void TimerProc(int32_t idEvent); static std::vector* s_TimerArray; diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.h b/fpdfsdk/pwl/cpwl_scroll_bar.h index 0b63bf224d..a61c04d019 100644 --- a/fpdfsdk/pwl/cpwl_scroll_bar.h +++ b/fpdfsdk/pwl/cpwl_scroll_bar.h @@ -57,10 +57,9 @@ class CPWL_SBButton final : public CPWL_Wnd { bool OnLButtonUp(const CFX_PointF& point, uint32_t nFlag) override; bool OnMouseMove(const CFX_PointF& point, uint32_t nFlag) override; - protected: + private: PWL_SCROLLBAR_TYPE m_eScrollBarType; PWL_SBBUTTON_TYPE m_eSBButtonType; - bool m_bMouseDown; }; @@ -142,7 +141,7 @@ class CPWL_ScrollBar final : public CPWL_Wnd { void SetNotifyForever(bool bForever) { m_bNotifyForever = bForever; } - protected: + private: void SetScrollRange(float fMin, float fMax, float fClientWidth); void SetScrollPos(float fPos); @@ -152,7 +151,6 @@ class CPWL_ScrollBar final : public CPWL_Wnd { void NotifyScrollWindow(); CFX_FloatRect GetScrollArea() const; - private: void CreateButtons(const CreateParams& cp); void OnMinButtonLBDown(const CFX_PointF& point); -- cgit v1.2.3