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 <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/core/fpdfapi/font/cpdf_cidfont.h b/core/fpdfapi/font/cpdf_cidfont.h
index 7aeb54b..5cbeeda 100644
--- a/core/fpdfapi/font/cpdf_cidfont.h
+++ b/core/fpdfapi/font/cpdf_cidfont.h
@@ -62,7 +62,7 @@
void GetVertOrigin(uint16_t CID, short& vx, short& vy) const;
int GetCharSize(uint32_t charcode) const;
- protected:
+ private:
void LoadGB2312();
int GetGlyphIndex(uint32_t unicodeb, bool* pVertGlyph);
int GetVerticalGlyph(int index, bool* pVertGlyph);
diff --git a/core/fpdfapi/font/cpdf_truetypefont.h b/core/fpdfapi/font/cpdf_truetypefont.h
index a3066d7..158a5df 100644
--- a/core/fpdfapi/font/cpdf_truetypefont.h
+++ b/core/fpdfapi/font/cpdf_truetypefont.h
@@ -20,7 +20,7 @@
const CPDF_TrueTypeFont* AsTrueTypeFont() const override;
CPDF_TrueTypeFont* AsTrueTypeFont() override;
- protected:
+ private:
// CPDF_Font:
bool Load() override;
diff --git a/core/fpdfapi/font/cpdf_type3font.h b/core/fpdfapi/font/cpdf_type3font.h
index d85bf70..fb32323 100644
--- a/core/fpdfapi/font/cpdf_type3font.h
+++ b/core/fpdfapi/font/cpdf_type3font.h
@@ -37,9 +37,6 @@
CFX_Matrix& GetFontMatrix() { return m_FontMatrix; }
- protected:
- CFX_Matrix m_FontMatrix;
-
private:
// CPDF_Font:
bool Load() override;
@@ -47,6 +44,7 @@
// CPDF_SimpleFont:
void LoadGlyphMap() override;
+ CFX_Matrix m_FontMatrix;
uint32_t m_CharWidthL[256];
UnownedPtr<CPDF_Dictionary> m_pCharProcs;
UnownedPtr<CPDF_Dictionary> m_pPageResources;
diff --git a/core/fpdfapi/parser/cfdf_document.h b/core/fpdfapi/parser/cfdf_document.h
index 6ab751e..7298f4e 100644
--- a/core/fpdfapi/parser/cfdf_document.h
+++ b/core/fpdfapi/parser/cfdf_document.h
@@ -29,7 +29,7 @@
ByteString WriteToString() const;
CPDF_Dictionary* GetRoot() const { return m_pRootDict.Get(); }
- protected:
+ private:
void ParseStream(const RetainPtr<IFX_SeekableReadStream>& pFile);
UnownedPtr<CPDF_Dictionary> m_pRootDict;
diff --git a/core/fpdfapi/parser/cpdf_array.h b/core/fpdfapi/parser/cpdf_array.h
index 0c9251c..c4686c0 100644
--- a/core/fpdfapi/parser/cpdf_array.h
+++ b/core/fpdfapi/parser/cpdf_array.h
@@ -112,7 +112,7 @@
const_iterator begin() const { return m_Objects.begin(); }
const_iterator end() const { return m_Objects.end(); }
- protected:
+ private:
std::unique_ptr<CPDF_Object> CloneNonCyclic(
bool bDirect,
std::set<const CPDF_Object*>* pVisited) const override;
diff --git a/core/fpdfapi/parser/cpdf_boolean.h b/core/fpdfapi/parser/cpdf_boolean.h
index 406381b..5aa63af 100644
--- a/core/fpdfapi/parser/cpdf_boolean.h
+++ b/core/fpdfapi/parser/cpdf_boolean.h
@@ -31,7 +31,7 @@
bool WriteTo(IFX_ArchiveStream* archive,
const CPDF_Encryptor* encryptor) const override;
- protected:
+ private:
bool m_bValue;
};
diff --git a/core/fpdfapi/parser/cpdf_data_avail.h b/core/fpdfapi/parser/cpdf_data_avail.h
index 100e2ae..4dff3ce 100644
--- a/core/fpdfapi/parser/cpdf_data_avail.h
+++ b/core/fpdfapi/parser/cpdf_data_avail.h
@@ -112,7 +112,7 @@
const CPDF_HintTables* GetHintTables() const { return m_pHintTables.get(); }
- protected:
+ private:
class PageNode {
public:
PageNode();
@@ -184,7 +184,6 @@
bool m_bPagesLoad = false;
std::unique_ptr<CPDF_PageObjectAvail> m_pFormAvail;
std::vector<std::unique_ptr<CPDF_Object>> m_PagesArray;
- uint32_t m_dwEncryptObjNum = 0;
bool m_bTotalLoadPageTree = false;
bool m_bCurPageDictLoadOK = false;
PageNode m_PageNode;
diff --git a/core/fpdfapi/parser/cpdf_dictionary.h b/core/fpdfapi/parser/cpdf_dictionary.h
index 4930e5e..1876a61 100644
--- a/core/fpdfapi/parser/cpdf_dictionary.h
+++ b/core/fpdfapi/parser/cpdf_dictionary.h
@@ -106,7 +106,7 @@
WeakPtr<ByteStringPool> GetByteStringPool() const { return m_pPool; }
- protected:
+ private:
ByteString MaybeIntern(const ByteString& str);
std::unique_ptr<CPDF_Object> CloneNonCyclic(
bool bDirect,
diff --git a/core/fpdfapi/parser/cpdf_name.h b/core/fpdfapi/parser/cpdf_name.h
index 1ef6c64..ee5a6ce 100644
--- a/core/fpdfapi/parser/cpdf_name.h
+++ b/core/fpdfapi/parser/cpdf_name.h
@@ -30,7 +30,7 @@
bool WriteTo(IFX_ArchiveStream* archive,
const CPDF_Encryptor* encryptor) const override;
- protected:
+ private:
ByteString m_Name;
};
diff --git a/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp b/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
index e2b23d4..7dc1dcc 100644
--- a/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_object_avail_unittest.cpp
@@ -27,7 +27,7 @@
void SimulateReadError() { ReadBlock(nullptr, 0, 1); }
- protected:
+ private:
TestReadValidator()
: CPDF_ReadValidator(
pdfium::MakeRetain<CFX_InvalidSeekableReadStream>(100),
diff --git a/core/fpdfapi/parser/cpdf_page_object_avail.h b/core/fpdfapi/parser/cpdf_page_object_avail.h
index b62ca4c..bb9e80a 100644
--- a/core/fpdfapi/parser/cpdf_page_object_avail.h
+++ b/core/fpdfapi/parser/cpdf_page_object_avail.h
@@ -14,7 +14,7 @@
using CPDF_ObjectAvail::CPDF_ObjectAvail;
~CPDF_PageObjectAvail() override;
- protected:
+ private:
bool ExcludeObject(const CPDF_Object* object) const override;
};
diff --git a/core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp b/core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp
index f278b6e..57ab09c 100644
--- a/core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp
+++ b/core/fpdfapi/parser/cpdf_page_object_avail_unittest.cpp
@@ -28,7 +28,7 @@
void SimulateReadError() { ReadBlock(nullptr, 0, 1); }
- protected:
+ private:
TestReadValidator()
: CPDF_ReadValidator(
pdfium::MakeRetain<CFX_InvalidSeekableReadStream>(100),
diff --git a/core/fpdfapi/parser/cpdf_reference.h b/core/fpdfapi/parser/cpdf_reference.h
index cb9c6ed..f7b03ac 100644
--- a/core/fpdfapi/parser/cpdf_reference.h
+++ b/core/fpdfapi/parser/cpdf_reference.h
@@ -42,7 +42,7 @@
uint32_t GetRefObjNum() const { return m_RefObjNum; }
void SetRef(CPDF_IndirectObjectHolder* pDoc, uint32_t objnum);
- protected:
+ private:
std::unique_ptr<CPDF_Object> CloneNonCyclic(
bool bDirect,
std::set<const CPDF_Object*>* pVisited) const override;
diff --git a/core/fpdfapi/parser/cpdf_stream.h b/core/fpdfapi/parser/cpdf_stream.h
index 9d8cf6d..aada80e 100644
--- a/core/fpdfapi/parser/cpdf_stream.h
+++ b/core/fpdfapi/parser/cpdf_stream.h
@@ -62,7 +62,7 @@
bool IsMemoryBased() const { return m_bMemoryBased; }
bool HasFilter() const;
- protected:
+ private:
std::unique_ptr<CPDF_Object> CloneNonCyclic(
bool bDirect,
std::set<const CPDF_Object*>* pVisited) const override;
diff --git a/core/fpdfapi/parser/cpdf_stream_acc.h b/core/fpdfapi/parser/cpdf_stream_acc.h
index 3c42639..ddbdc6a 100644
--- a/core/fpdfapi/parser/cpdf_stream_acc.h
+++ b/core/fpdfapi/parser/cpdf_stream_acc.h
@@ -41,13 +41,12 @@
const CPDF_Dictionary* GetImageParam() const { return m_pImageParam.Get(); }
std::unique_ptr<uint8_t, FxFreeDeleter> DetachData();
- protected:
+ private:
explicit CPDF_StreamAcc(const CPDF_Stream* pStream);
~CPDF_StreamAcc() override;
void LoadAllData(bool bRawAccess, uint32_t estimated_size, bool bImageAcc);
- private:
uint8_t* m_pData = nullptr;
uint32_t m_dwSize = 0;
bool m_bNewBuf = false;
diff --git a/core/fpdfapi/parser/cpdf_string.h b/core/fpdfapi/parser/cpdf_string.h
index 75cc3c4..d3fc2c5 100644
--- a/core/fpdfapi/parser/cpdf_string.h
+++ b/core/fpdfapi/parser/cpdf_string.h
@@ -36,7 +36,7 @@
bool IsHex() const { return m_bHex; }
- protected:
+ private:
ByteString m_String;
bool m_bHex;
};
diff --git a/core/fxcodec/codec/ccodec_flatemodule.cpp b/core/fxcodec/codec/ccodec_flatemodule.cpp
index c603ce1..0dc1822 100644
--- a/core/fxcodec/codec/ccodec_flatemodule.cpp
+++ b/core/fxcodec/codec/ccodec_flatemodule.cpp
@@ -642,7 +642,7 @@
bool v_Rewind() override;
uint8_t* v_GetNextLine() override;
- protected:
+ private:
void GetNextLineWithPredictedPitch();
void GetNextLineWithoutPredictedPitch();
diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp
index b93f541..d38f10a 100644
--- a/core/fxcodec/codec/fx_codec.cpp
+++ b/core/fxcodec/codec/fx_codec.cpp
@@ -1540,7 +1540,7 @@
uint8_t* v_GetNextLine() override;
uint32_t GetSrcOffset() override { return m_SrcOffset; }
- protected:
+ private:
bool CheckDestSize();
void GetNextOperator();
void UpdateOperator(uint8_t used_bytes);
diff --git a/core/fxcrt/cfx_fileaccess_posix.h b/core/fxcrt/cfx_fileaccess_posix.h
index 7b8230d..c759d8c 100644
--- a/core/fxcrt/cfx_fileaccess_posix.h
+++ b/core/fxcrt/cfx_fileaccess_posix.h
@@ -37,7 +37,7 @@
bool Flush() override;
bool Truncate(FX_FILESIZE szFile) override;
- protected:
+ private:
int32_t m_nFD;
};
diff --git a/core/fxcrt/cfx_fileaccess_windows.h b/core/fxcrt/cfx_fileaccess_windows.h
index fad2ed6..6d58409 100644
--- a/core/fxcrt/cfx_fileaccess_windows.h
+++ b/core/fxcrt/cfx_fileaccess_windows.h
@@ -35,7 +35,7 @@
bool Flush() override;
bool Truncate(FX_FILESIZE szFile) override;
- protected:
+ private:
void* m_hFile;
};
diff --git a/core/fxcrt/css/cfx_cssvaluelist.h b/core/fxcrt/css/cfx_cssvaluelist.h
index 5e04c64..4b87f4c 100644
--- a/core/fxcrt/css/cfx_cssvaluelist.h
+++ b/core/fxcrt/css/cfx_cssvaluelist.h
@@ -19,7 +19,7 @@
int32_t CountValues() const;
RetainPtr<CFX_CSSValue> GetValue(int32_t index) const;
- protected:
+ private:
std::vector<RetainPtr<CFX_CSSValue>> m_ppList;
};
diff --git a/core/fxge/android/cfx_androidfontinfo.h b/core/fxge/android/cfx_androidfontinfo.h
index f671bfb..86b0d34 100644
--- a/core/fxge/android/cfx_androidfontinfo.h
+++ b/core/fxge/android/cfx_androidfontinfo.h
@@ -37,7 +37,7 @@
bool GetFontCharset(void* hFont, int* charset) override;
void DeleteFont(void* hFont) override;
- protected:
+ private:
UnownedPtr<CFPF_SkiaFontMgr> m_pFontMgr;
};
diff --git a/core/fxge/win32/cfx_windowsdib.h b/core/fxge/win32/cfx_windowsdib.h
index 4b7de7d..edc1ed7 100644
--- a/core/fxge/win32/cfx_windowsdib.h
+++ b/core/fxge/win32/cfx_windowsdib.h
@@ -42,7 +42,7 @@
void LoadFromDevice(HDC hDC, int left, int top);
void SetToDevice(HDC hDC, int left, int top);
- protected:
+ private:
CFX_WindowsDIB(HDC hDC, int width, int height);
~CFX_WindowsDIB() override;
diff --git a/core/fxge/win32/win32_int.h b/core/fxge/win32/win32_int.h
index 0bc68c4..7b4f9ab 100644
--- a/core/fxge/win32/win32_int.h
+++ b/core/fxge/win32/win32_int.h
@@ -193,7 +193,7 @@
explicit CGdiDisplayDriver(HDC hDC);
~CGdiDisplayDriver() override;
- protected:
+ private:
bool GetDIBits(const RetainPtr<CFX_DIBitmap>& pBitmap,
int left,
int top) override;
@@ -234,7 +234,7 @@
explicit CGdiPrinterDriver(HDC hDC);
~CGdiPrinterDriver() override;
- protected:
+ private:
int GetDeviceCaps(int caps_id) const override;
bool SetDIBits(const RetainPtr<CFX_DIBBase>& pBitmap,
uint32_t color,
@@ -274,7 +274,7 @@
CPSPrinterDriver(HDC hDC, WindowsPrintMode mode, bool bCmykOutput);
~CPSPrinterDriver() override;
- protected:
+ private:
// RenderDeviceDriverIface
int GetDeviceCaps(int caps_id) const override;
bool StartRendering() override;
@@ -339,7 +339,7 @@
explicit CTextOnlyPrinterDriver(HDC hDC);
~CTextOnlyPrinterDriver() override;
- protected:
+ private:
// RenderDeviceDriverIface
int GetDeviceCaps(int caps_id) const override;
void SaveState() override{};
diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp
index 0ec8d17..2d2d78a 100644
--- a/fpdfsdk/cpdfsdk_helpers.cpp
+++ b/fpdfsdk/cpdfsdk_helpers.cpp
@@ -54,7 +54,7 @@
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 887f06d..1315375 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_context.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_context.h
@@ -93,7 +93,7 @@
std::unique_ptr<IFWL_AdapterTimerMgr> NewTimerMgr() override;
- protected:
+ private:
friend class CPDFXFA_DocEnvironment;
int GetOriginalPageCount() const { return m_nPageCount; }
@@ -107,7 +107,6 @@
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 769bdaa..9037622 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_page.h
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_page.h
@@ -52,7 +52,7 @@
m_pXFAPageView = pPageView;
}
- protected:
+ private:
// Refcounted class.
CPDFXFA_Page(CPDFXFA_Context* pContext, int page_index);
~CPDFXFA_Page() override;
@@ -60,7 +60,6 @@
bool LoadPDFPage();
bool LoadXFAPageView();
- private:
RetainPtr<CPDF_Page> m_pPDFPage;
CXFA_FFPageView* m_pXFAPageView;
UnownedPtr<CPDFXFA_Context> const m_pContext;
diff --git a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
index 8bca0bd..770b0e2 100644
--- a/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
+++ b/fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h
@@ -26,7 +26,7 @@
CFWL_TimerInfo** pTimerInfo) override;
void Stop(CFWL_TimerInfo* pTimerInfo) override;
- protected:
+ private:
static void TimerProc(int32_t idEvent);
static std::vector<CFWL_TimerInfo*>* s_TimerArray;
diff --git a/fpdfsdk/pwl/cpwl_scroll_bar.h b/fpdfsdk/pwl/cpwl_scroll_bar.h
index 0b63bf2..a61c04d 100644
--- a/fpdfsdk/pwl/cpwl_scroll_bar.h
+++ b/fpdfsdk/pwl/cpwl_scroll_bar.h
@@ -57,10 +57,9 @@
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 @@
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 @@
void NotifyScrollWindow();
CFX_FloatRect GetScrollArea() const;
- private:
void CreateButtons(const CreateParams& cp);
void OnMinButtonLBDown(const CFX_PointF& point);
diff --git a/fxbarcode/oned/BC_OnedEAN13Writer.h b/fxbarcode/oned/BC_OnedEAN13Writer.h
index 3c7ff2e..c800918 100644
--- a/fxbarcode/oned/BC_OnedEAN13Writer.h
+++ b/fxbarcode/oned/BC_OnedEAN13Writer.h
@@ -31,14 +31,13 @@
int32_t CalcChecksum(const ByteString& contents);
- protected:
+ private:
bool ShowChars(const WideStringView& contents,
CFX_RenderDevice* device,
const CFX_Matrix* matrix,
int32_t barWidth,
int32_t multiple) override;
- private:
int32_t m_codeWidth;
};
diff --git a/fxbarcode/oned/BC_OnedEAN8Writer.h b/fxbarcode/oned/BC_OnedEAN8Writer.h
index 269156a..853d4da 100644
--- a/fxbarcode/oned/BC_OnedEAN8Writer.h
+++ b/fxbarcode/oned/BC_OnedEAN8Writer.h
@@ -34,14 +34,13 @@
bool SetTextLocation(BC_TEXT_LOC location);
int32_t CalcChecksum(const ByteString& contents);
- protected:
+ private:
bool ShowChars(const WideStringView& contents,
CFX_RenderDevice* device,
const CFX_Matrix* matrix,
int32_t barWidth,
int32_t multiple) override;
- private:
static constexpr int32_t kDefaultCodeWidth = 3 + (7 * 4) + 5 + (7 * 4) + 3;
int32_t m_codeWidth = kDefaultCodeWidth;
};
diff --git a/fxbarcode/oned/BC_OnedUPCAWriter.h b/fxbarcode/oned/BC_OnedUPCAWriter.h
index 1a9f091..6101b4d 100644
--- a/fxbarcode/oned/BC_OnedUPCAWriter.h
+++ b/fxbarcode/oned/BC_OnedUPCAWriter.h
@@ -36,14 +36,13 @@
void Init();
int32_t CalcChecksum(const ByteString& contents);
- protected:
+ private:
bool ShowChars(const WideStringView& contents,
CFX_RenderDevice* device,
const CFX_Matrix* matrix,
int32_t barWidth,
int32_t multiple) override;
- private:
std::unique_ptr<CBC_OnedEAN13Writer> m_subWriter;
};
diff --git a/fxjs/cjs_runtimestub.h b/fxjs/cjs_runtimestub.h
index cc32744..779a675 100644
--- a/fxjs/cjs_runtimestub.h
+++ b/fxjs/cjs_runtimestub.h
@@ -36,7 +36,7 @@
Optional<IJS_Runtime::JS_Error> ExecuteScript(
const WideString& script) override;
- protected:
+ private:
UnownedPtr<CPDFSDK_FormFillEnvironment> const m_pFormFillEnv;
std::unique_ptr<IJS_EventContext> m_pContext;
};
diff --git a/testing/embedder_test_timer_handling_delegate.h b/testing/embedder_test_timer_handling_delegate.h
index 31ce1e2..34b4cbb 100644
--- a/testing/embedder_test_timer_handling_delegate.h
+++ b/testing/embedder_test_timer_handling_delegate.h
@@ -77,7 +77,7 @@
void SetFailNextTimer() { fail_next_timer_ = true; }
- protected:
+ private:
std::multimap<int, Timer> expiry_to_timer_map_; // Keyed by timeout.
bool fail_next_timer_ = false;
int next_timer_id_ = 0;
diff --git a/xfa/fwl/theme/cfwl_carettp.h b/xfa/fwl/theme/cfwl_carettp.h
index a71afc9..2fe01be 100644
--- a/xfa/fwl/theme/cfwl_carettp.h
+++ b/xfa/fwl/theme/cfwl_carettp.h
@@ -17,7 +17,7 @@
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
void DrawCaretBK(CXFA_Graphics* pGraphics,
uint32_t dwStates,
const CFX_RectF* pRect,
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.h b/xfa/fwl/theme/cfwl_checkboxtp.h
index fa06c7e..506f784 100644
--- a/xfa/fwl/theme/cfwl_checkboxtp.h
+++ b/xfa/fwl/theme/cfwl_checkboxtp.h
@@ -23,7 +23,7 @@
void DrawText(CFWL_ThemeText* pParams) override;
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
struct CKBThemeData {
FX_ARGB clrSignBorderNormal;
FX_ARGB clrSignBorderDisable;
@@ -66,12 +66,10 @@
CFX_Matrix* pMatrix);
void InitCheckPath(float fCheckLen);
+ void SetThemeData();
std::unique_ptr<CKBThemeData> m_pThemeData;
std::unique_ptr<CXFA_GEPath> m_pCheckPath;
-
- private:
- void SetThemeData();
};
#endif // XFA_FWL_THEME_CFWL_CHECKBOXTP_H_
diff --git a/xfa/fwl/theme/cfwl_comboboxtp.h b/xfa/fwl/theme/cfwl_comboboxtp.h
index dd8311c..1456143 100644
--- a/xfa/fwl/theme/cfwl_comboboxtp.h
+++ b/xfa/fwl/theme/cfwl_comboboxtp.h
@@ -17,7 +17,7 @@
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
void DrawDropDownButton(CFWL_ThemeBackground* pParams,
uint32_t dwStates,
CFX_Matrix* pMatrix);
diff --git a/xfa/fwl/theme/cfwl_datetimepickertp.h b/xfa/fwl/theme/cfwl_datetimepickertp.h
index 5a54851..e7a7239 100644
--- a/xfa/fwl/theme/cfwl_datetimepickertp.h
+++ b/xfa/fwl/theme/cfwl_datetimepickertp.h
@@ -17,7 +17,7 @@
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
void DrawDropDownButton(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
};
diff --git a/xfa/fwl/theme/cfwl_listboxtp.h b/xfa/fwl/theme/cfwl_listboxtp.h
index 95ce01c..e87ac6f 100644
--- a/xfa/fwl/theme/cfwl_listboxtp.h
+++ b/xfa/fwl/theme/cfwl_listboxtp.h
@@ -17,7 +17,7 @@
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
void DrawListBoxItem(CXFA_Graphics* pGraphics,
uint32_t dwStates,
const CFX_RectF* prtItem,
diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.h b/xfa/fwl/theme/cfwl_monthcalendartp.h
index 95e2a19..4dd08b4 100644
--- a/xfa/fwl/theme/cfwl_monthcalendartp.h
+++ b/xfa/fwl/theme/cfwl_monthcalendartp.h
@@ -22,7 +22,7 @@
void DrawBackground(CFWL_ThemeBackground* pParams) override;
void DrawText(CFWL_ThemeText* pParams) override;
- protected:
+ private:
struct MCThemeData {
FX_ARGB clrCaption;
FX_ARGB clrSeperator;
@@ -43,12 +43,10 @@
void DrawHSeperator(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
void DrawWeekNumSep(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
FWLTHEME_STATE GetState(uint32_t dwFWLStates);
+ void SetThemeData();
std::unique_ptr<MCThemeData> m_pThemeData;
WideString wsResource;
-
- private:
- void SetThemeData();
};
#endif // XFA_FWL_THEME_CFWL_MONTHCALENDARTP_H_
diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.h b/xfa/fwl/theme/cfwl_pushbuttontp.h
index 2e1782a..6b49ba6 100644
--- a/xfa/fwl/theme/cfwl_pushbuttontp.h
+++ b/xfa/fwl/theme/cfwl_pushbuttontp.h
@@ -19,7 +19,7 @@
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
struct PBThemeData {
FX_ARGB clrBorder[5];
FX_ARGB clrStart[5];
@@ -34,13 +34,10 @@
void SetBackgroudColor(uint32_t* pData);
void SetCaptionColor(uint32_t* pData);
void SetCornerColor(uint32_t* pData);
-
int32_t GetColorID(uint32_t dwStates) const;
+ void SetThemeData();
std::unique_ptr<PBThemeData> m_pThemeData;
-
- private:
- void SetThemeData();
};
#endif // XFA_FWL_THEME_CFWL_PUSHBUTTONTP_H_
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h
index 53cbb38..2a202e1 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.h
+++ b/xfa/fwl/theme/cfwl_scrollbartp.h
@@ -19,7 +19,7 @@
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
struct SBThemeData {
FX_ARGB clrTrackBKStart;
FX_ARGB clrTrackBKEnd;
@@ -51,11 +51,9 @@
bool bVert,
FWLTHEME_STATE eState,
CFX_Matrix* pMatrix);
+ void SetThemeData();
std::unique_ptr<SBThemeData> m_pThemeData;
-
- private:
- void SetThemeData();
};
#endif // XFA_FWL_THEME_CFWL_SCROLLBARTP_H_
diff --git a/xfa/fxfa/cxfa_ffpageview.h b/xfa/fxfa/cxfa_ffpageview.h
index a745b06..16477fa 100644
--- a/xfa/fxfa/cxfa_ffpageview.h
+++ b/xfa/fxfa/cxfa_ffpageview.h
@@ -29,7 +29,7 @@
uint32_t dwTraverseWay,
uint32_t dwWidgetFilter);
- protected:
+ private:
UnownedPtr<CXFA_FFDocView> const m_pDocView;
};
@@ -46,7 +46,7 @@
CXFA_FFWidget* GetCurrentWidget() override;
bool SetCurrentWidget(CXFA_FFWidget* hWidget) override;
- protected:
+ private:
CXFA_FFWidget* GetWidget(CXFA_LayoutItem* pLayoutItem);
UnownedPtr<CXFA_FFPageView> m_pPageView;
@@ -85,7 +85,7 @@
CXFA_FFWidget* GetCurrentWidget() override;
bool SetCurrentWidget(CXFA_FFWidget* hWidget) override;
- protected:
+ private:
CXFA_FFWidget* GetTraverseWidget(CXFA_FFWidget* pWidget);
CXFA_FFWidget* FindWidgetByName(const WideString& wsWidgetName,
CXFA_FFWidget* pRefWidget);
