From a4fbc2814c231da29104bb8922811127a59bd6e7 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 20 Apr 2015 15:12:39 -0700 Subject: Remove Release() from IFX_Edit_UndoItem. Also delete unused CFFL_Edit_UndoItem class. BUG=https://code.google.com/p/pdfium/issues/detail?id=140 R=thestig@chromium.org Review URL: https://codereview.chromium.org/1098043002 --- fpdfsdk/src/formfiller/FFL_TextField.cpp | 29 ----------------------------- fpdfsdk/src/fxedit/fxet_edit.cpp | 25 ++++--------------------- 2 files changed, 4 insertions(+), 50 deletions(-) (limited to 'fpdfsdk/src') diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index 6a70981e4f..f45d95364d 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -4,37 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -//#include "../include/FormFiller.h" -//#include "../include/FFL_FormFiller.h" #include "../../include/formfiller/FFL_TextField.h" #include "../../include/formfiller/FFL_CBA_Fontmap.h" -//#include "../include/FFL_Notify.h" - -CFFL_EditUndoItem::CFFL_EditUndoItem(CPWL_Edit* pEdit) -{ -} - -CFFL_EditUndoItem::~CFFL_EditUndoItem() -{ -} - -void CFFL_EditUndoItem::Undo() -{ -} - -void CFFL_EditUndoItem::Redo() -{ -} - -CFX_WideString CFFL_EditUndoItem::GetDescr() -{ - return L"Input"; -} - -void CFFL_EditUndoItem::Release() -{ - delete this; -} /* ------------------------------- CFFL_TextField ------------------------------- */ diff --git a/fpdfsdk/src/fxedit/fxet_edit.cpp b/fpdfsdk/src/fxedit/fxet_edit.cpp index 2d25ba3383..c7f7ce5b04 100644 --- a/fpdfsdk/src/fxedit/fxet_edit.cpp +++ b/fpdfsdk/src/fxedit/fxet_edit.cpp @@ -453,10 +453,7 @@ void CFX_Edit_Undo::RemoveHeads() { ASSERT(m_UndoItemStack.GetSize() > 1); - IFX_Edit_UndoItem* pItem = m_UndoItemStack.GetAt(0); - ASSERT(pItem != NULL); - - pItem->Release(); + delete m_UndoItemStack.GetAt(0); m_UndoItemStack.RemoveAt(0); } @@ -464,10 +461,7 @@ void CFX_Edit_Undo::RemoveTails() { for (FX_INT32 i = m_UndoItemStack.GetSize()-1; i >= m_nCurUndoPos; i--) { - IFX_Edit_UndoItem* pItem = m_UndoItemStack.GetAt(i); - ASSERT(pItem != NULL); - - pItem->Release(); + delete m_UndoItemStack.GetAt(i); m_UndoItemStack.RemoveAt(i); } } @@ -476,10 +470,7 @@ void CFX_Edit_Undo::Reset() { for (FX_INT32 i=0, sz=m_UndoItemStack.GetSize(); i < sz; i++) { - IFX_Edit_UndoItem * pItem = m_UndoItemStack.GetAt(i); - ASSERT(pItem != NULL); - - pItem->Release(); + delete m_UndoItemStack.GetAt(i); } m_nCurUndoPos = 0; m_UndoItemStack.RemoveAll(); @@ -495,10 +486,7 @@ CFX_Edit_GroupUndoItem::~CFX_Edit_GroupUndoItem() { for (int i=0,sz=m_Items.GetSize(); iRelease(); + delete m_Items[i]; } m_Items.RemoveAll(); @@ -558,11 +546,6 @@ CFX_WideString CFX_Edit_GroupUndoItem::GetUndoTitle() return m_sTitle; } -void CFX_Edit_GroupUndoItem::Release() -{ - delete this; -} - /* ------------------------------------- CFX_Edit_UndoItem derived classes ------------------------------------- */ CFXEU_InsertWord::CFXEU_InsertWord(CFX_Edit * pEdit, const CPVT_WordPlace & wpOldPlace, const CPVT_WordPlace & wpNewPlace, -- cgit v1.2.3