From ced4c2bf1d0d1bab14a6145b35b3baecb175a691 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 20 Apr 2015 16:33:30 -0700 Subject: Merge to XFA: Remove Release() combo patch. Includes: Original Review URL: https://codereview.chromium.org/1098043002 Original Review URL: https://codereview.chromium.org/1097843003 Original Review URL: https://codereview.chromium.org/1093213002 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1092033004 --- fpdfsdk/include/formfiller/FFL_TextField.h | 16 +--------------- fpdfsdk/include/fsdk_baseform.h | 23 +++++++++-------------- fpdfsdk/include/fxedit/fx_edit.h | 6 ++---- fpdfsdk/include/fxedit/fxet_edit.h | 17 ++++++----------- 4 files changed, 18 insertions(+), 44 deletions(-) (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h index b987a9c8ae..8351878522 100644 --- a/fpdfsdk/include/formfiller/FFL_TextField.h +++ b/fpdfsdk/include/formfiller/FFL_TextField.h @@ -15,19 +15,6 @@ class CBA_FontMap; - -class CFFL_EditUndoItem -{ -public: - CFFL_EditUndoItem(CPWL_Edit* pEdit); - virtual ~CFFL_EditUndoItem(); - - virtual void Undo(); - virtual void Redo(); - virtual CFX_WideString GetDescr(); - virtual void Release(); -}; - struct FFL_TextFieldState { int nStart; @@ -81,9 +68,8 @@ public: private: CBA_FontMap* m_pFontMap; -// CBA_SpellCheck* m_pSpellCheck; FFL_TextFieldState m_State; -// CFFL_IM_BOX m_IMBox; + }; #endif // !defined(AFX_FFL_EDIT_H__8E0C9456_CBA2_4EFB_9F31_53C6D8C1A8AC__INCLUDED_) diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index ff9dfa163d..615be4507c 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -333,32 +333,27 @@ private: #define CPDFSDK_Annots CFX_ArrayTemplate #define CPDFSDK_SortAnnots CGW_ArrayTemplate -class CBA_AnnotIterator +class CBA_AnnotIterator { public: CBA_AnnotIterator(CPDFSDK_PageView* pPageView, const CFX_ByteString& sType, const CFX_ByteString& sSubType); - virtual ~CBA_AnnotIterator(); - - virtual CPDFSDK_Annot* GetFirstAnnot(); - virtual CPDFSDK_Annot* GetLastAnnot(); - virtual CPDFSDK_Annot* GetNextAnnot(CPDFSDK_Annot* pAnnot); - virtual CPDFSDK_Annot* GetPrevAnnot(CPDFSDK_Annot* pAnnot); - - virtual void Release(){delete this;} - + ~CBA_AnnotIterator(); + + CPDFSDK_Annot* GetFirstAnnot(); + CPDFSDK_Annot* GetLastAnnot(); + CPDFSDK_Annot* GetNextAnnot(CPDFSDK_Annot* pAnnot); + CPDFSDK_Annot* GetPrevAnnot(CPDFSDK_Annot* pAnnot); + private: void GenerateResults(); static int CompareByLeft(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2); static int CompareByTop(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2); - static CPDF_Rect GetAnnotRect(CPDFSDK_Annot* pAnnot); - -private: + CPDFSDK_PageView* m_pPageView; CFX_ByteString m_sType; CFX_ByteString m_sSubType; int m_nTabs; - CPDFSDK_Annots m_Annots; }; diff --git a/fpdfsdk/include/fxedit/fx_edit.h b/fpdfsdk/include/fxedit/fx_edit.h index a842fd6284..bf00995ea9 100644 --- a/fpdfsdk/include/fxedit/fx_edit.h +++ b/fpdfsdk/include/fxedit/fx_edit.h @@ -164,13 +164,11 @@ public: class IFX_Edit_UndoItem { public: - virtual void Release() = 0; + virtual ~IFX_Edit_UndoItem() { } + virtual void Undo() = 0; virtual void Redo() = 0; virtual CFX_WideString GetUndoTitle() = 0; - -protected: - ~IFX_Edit_UndoItem() { } }; class FXET_CLASS IFX_Edit diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h index 8aa44a4bed..9e5c40f5ff 100644 --- a/fpdfsdk/include/fxedit/fxet_edit.h +++ b/fpdfsdk/include/fxedit/fxet_edit.h @@ -325,12 +325,9 @@ class CFX_Edit_UndoItem : public IFX_Edit_UndoItem { public: CFX_Edit_UndoItem() : m_bFirst(TRUE), m_bLast(TRUE) {} - virtual ~CFX_Edit_UndoItem(){} - virtual CFX_WideString GetUndoTitle() {return L"";} - virtual void Release(){delete this;} + CFX_WideString GetUndoTitle() override { return L""; } -public: void SetFirst(FX_BOOL bFirst){m_bFirst = bFirst;} FX_BOOL IsFirst(){return m_bFirst;} void SetLast(FX_BOOL bLast){m_bLast = bLast;} @@ -345,17 +342,15 @@ class CFX_Edit_GroupUndoItem : public IFX_Edit_UndoItem { public: CFX_Edit_GroupUndoItem(const CFX_WideString& sTitle); - virtual ~CFX_Edit_GroupUndoItem(); + ~CFX_Edit_GroupUndoItem() override; + + void Undo() override; + void Redo() override; + CFX_WideString GetUndoTitle() override; void AddUndoItem(CFX_Edit_UndoItem* pUndoItem); void UpdateItems(); -public: - virtual void Undo(); - virtual void Redo(); - virtual CFX_WideString GetUndoTitle(); - virtual void Release(); - private: CFX_WideString m_sTitle; CFX_ArrayTemplate m_Items; -- cgit v1.2.3