Merge to XFA: Remove Release() combo patch.

fpdfsdk/include/fxedit/fxet_edit.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FXET_EDIT_H_
 #define _FXET_EDIT_H_
 
 #include "../../../core/include/fpdfdoc/fpdf_vt.h"
@@ skipping 307 matching lines @@
         FX_INT32                                                                m_nBufSize;
         FX_BOOL                                                                 m_bModified; 
         FX_BOOL                                                                 m_bVirgin;
         FX_BOOL                                                                 m_bWorking;
 };
 
 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;}
         FX_BOOL                                                                 IsLast(){return m_bLast;}
 
 private:
         FX_BOOL                                                                 m_bFirst;
         FX_BOOL                                                                 m_bLast;
 };
 
 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<CFX_Edit_UndoItem*>   m_Items;
 };
 
 /* ------------------------- CFX_Edit_UndoItem derived classes ---------------------------- */
 
 class CFXEU_InsertWord : public CFX_Edit_UndoItem
 {
 public:
@@ skipping 445 matching lines @@
         FX_INT32                                        GetWordFontIndex(FX_WORD word, FX_INT32 charset, FX_INT32 nFontIndex);
         FX_INT32                                        GetDefaultFontIndex();
         FX_BOOL                                         IsLatinWord(FX_WORD word);
 
 private:
         IFX_Edit_FontMap*                       m_pFontMap;
 };
 
 #endif //_FXET_EDIT_H_