Merge to XFA: Remove Release() combo patch.

fpdfsdk/include/fsdk_baseform.h

Index: fpdfsdk/include/fsdk_baseform.h
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index ff9dfa163de8be1993cedb6924c69e35e71358d2..615be4507c8ecdbd42bb662b770902b7fd4dda76 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -333,32 +333,27 @@ private:
 
 #define CPDFSDK_Annots				CFX_ArrayTemplate<CPDFSDK_Annot*>
 #define CPDFSDK_SortAnnots			CGW_ArrayTemplate<CPDFSDK_Annot*>
-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;
 };