diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-10-17 09:08:26 -0400 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-17 14:30:31 +0000 |
commit | 6dc4fb899acfee6261a44cde8015b5c8f3eb75a3 (patch) | |
tree | 712f5b8e4e943ec6b8a36c979444a48189a7f8a0 /fpdfsdk/pwl/cpwl_edit_impl.h | |
parent | 38ce5278ad391b66716425788b45a0bfa2331412 (diff) | |
download | pdfium-6dc4fb899acfee6261a44cde8015b5c8f3eb75a3.tar.xz |
Remove friends from PWL classes
This CL removes the friend entries from the various pwl/ classes.
Change-Id: Ib93a2bedcde521eb92e53580b5d7cd9bca08902f
Reviewed-on: https://pdfium-review.googlesource.com/16150
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/pwl/cpwl_edit_impl.h')
-rw-r--r-- | fpdfsdk/pwl/cpwl_edit_impl.h | 42 |
1 files changed, 16 insertions, 26 deletions
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.h b/fpdfsdk/pwl/cpwl_edit_impl.h index 11edae6180..387f6e700d 100644 --- a/fpdfsdk/pwl/cpwl_edit_impl.h +++ b/fpdfsdk/pwl/cpwl_edit_impl.h @@ -362,17 +362,22 @@ class CPWL_EditImpl { uint16_t Word, uint16_t SubWord); - private: - friend class CPWL_EditImpl_Iterator; - friend class CFXEU_InsertWord; - friend class CFXEU_InsertReturn; - friend class CFXEU_Backspace; - friend class CFXEU_Delete; - friend class CFXEU_Clear; - friend class CFXEU_InsertText; - void SetSelection(const CPVT_WordPlace& begin, const CPVT_WordPlace& end); + bool Delete(bool bAddUndo, bool bPaint); + bool Clear(bool bAddUndo, bool bPaint); + bool InsertText(const WideString& sText, + int32_t charset, + bool bAddUndo, + bool bPaint); + bool InsertWord(uint16_t word, int32_t charset, bool bAddUndo, bool bPaint); + bool InsertReturn(bool bAddUndo, bool bPaint); + bool Backspace(bool bAddUndo, bool bPaint); + void SetCaret(const CPVT_WordPlace& place); + + CFX_PointF VTToEdit(const CFX_PointF& point) const; + + private: void RearrangeAll(); void RearrangePart(const CPVT_WordRange& range); void ScrollToCaret(); @@ -382,35 +387,20 @@ class CPWL_EditImpl { void SetScrollLimit(); void SetContentChanged(); - bool InsertWord(uint16_t word, - int32_t charset, - bool bAddUndo, - bool bPaint); - bool InsertReturn(bool bAddUndo, bool bPaint); - bool Backspace(bool bAddUndo, bool bPaint); - bool Delete(bool bAddUndo, bool bPaint); - bool Clear(bool bAddUndo, bool bPaint); - bool InsertText(const WideString& sText, - int32_t charset, - bool bAddUndo, - bool bPaint); void PaintInsertText(const CPVT_WordPlace& wpOld, const CPVT_WordPlace& wpNew); - inline CFX_PointF VTToEdit(const CFX_PointF& point) const; - inline CFX_PointF EditToVT(const CFX_PointF& point) const; - inline CFX_FloatRect VTToEdit(const CFX_FloatRect& rect) const; + CFX_PointF EditToVT(const CFX_PointF& point) const; + CFX_FloatRect VTToEdit(const CFX_FloatRect& rect) const; void Refresh(); void RefreshPushLineRects(const CPVT_WordRange& wr); - void SetCaret(const CPVT_WordPlace& place); void SetCaretInfo(); void SetCaretOrigin(); void AddEditUndoItem(std::unique_ptr<IFX_Edit_UndoItem> pEditUndoItem); - private: std::unique_ptr<CPDF_VariableText> m_pVT; UnownedPtr<CPWL_EditCtrl> m_pNotify; UnownedPtr<CPWL_Edit> m_pOperationNotify; |