merge to XFA: Fix -Wnon-virtual-dtor compiler warnings.

fpdfsdk/include/fsdk_annothandler.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 _FSDK_ANNOTHANDLER_H_
 #define _FSDK_ANNOTHANDLER_H_
 
 #define FSDK_XFAWIDGET_TYPENAME "XFAWidget"
@@ skipping 288 matching lines @@
         CFX_MapByteStringToPtr          m_mapType2Handler;
         CPDFDoc_Environment*            m_pApp;
 };
 
 //#define CBF_Page2Accessible    CFX_MapPtrTemplate<CPDFSDK_PageView*, IAccessible*>
 
 typedef int (*AI_COMPARE) (CPDFSDK_Annot* p1, CPDFSDK_Annot* p2);
 
 class CPDFSDK_AnnotIterator
 {
-protected:
-        CPDFSDK_Annot*  NextAnnot (const CPDFSDK_Annot* pCurrent) ;
-        CPDFSDK_Annot*  PrevAnnot (const CPDFSDK_Annot* pCurrent) ;     
-        CPDFSDK_Annot*  NextAnnot(int& index ) ;
-        CPDFSDK_Annot*  PrevAnnot(int& index ) ;
 public:
     CPDFSDK_AnnotIterator(CPDFSDK_PageView * pPageView, FX_BOOL bReverse,
-                FX_BOOL bIgnoreTopmost=FALSE,FX_BOOL bCircle=FALSE,CFX_PtrArray* pList=NULL);   
+                FX_BOOL bIgnoreTopmost=FALSE,FX_BOOL bCircle=FALSE,CFX_PtrArray* pList=NULL);
+    virtual ~CPDFSDK_AnnotIterator() { }
+
         virtual CPDFSDK_Annot*  Next (const CPDFSDK_Annot* pCurrent) ;
         virtual CPDFSDK_Annot*  Prev (const CPDFSDK_Annot* pCurrent) ;  
         virtual CPDFSDK_Annot*  Next(int& index ) ;
         virtual CPDFSDK_Annot*  Prev(int& index ) ;
         virtual int             Count(){return m_pIteratorAnnotList.GetSize();}
-        
+
         virtual FX_BOOL         InitIteratorAnnotList(CPDFSDK_PageView * pPageView,CFX_PtrArray* pList=NULL);
-        
+
         void                                    InsertSort(CFX_PtrArray &arrayList, AI_COMPARE pCompare);
+
 protected:
-        //      CFX_PtrList                      m_pIteratorAnnotList; 
-        CFX_PtrArray         m_pIteratorAnnotList;      
+        CPDFSDK_Annot*  NextAnnot (const CPDFSDK_Annot* pCurrent) ;
+        CPDFSDK_Annot*  PrevAnnot (const CPDFSDK_Annot* pCurrent) ;
+        CPDFSDK_Annot*  NextAnnot(int& index ) ;
+        CPDFSDK_Annot*  PrevAnnot(int& index ) ;
+
+        CFX_PtrArray         m_pIteratorAnnotList;
         FX_BOOL                      m_bReverse;
         FX_BOOL              m_bIgnoreTopmost;
         FX_BOOL              m_bCircle;
 };
 
 
 
 #endif