summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/fsdk_annothandler.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-01-09 11:46:17 -0800
committerTom Sepez <tsepez@chromium.org>2015-01-09 11:46:17 -0800
commite5b59cacbb7ed6bcefe25d736a315753dd764594 (patch)
tree973eb3e80739558ba3c06f8b06358bfb1c79581c /fpdfsdk/include/fsdk_annothandler.h
parent1c83be6bedb4dceb06ef7e8e6a5d76105d0fff4d (diff)
downloadpdfium-e5b59cacbb7ed6bcefe25d736a315753dd764594.tar.xz
merge to XFA: Fix -Wnon-virtual-dtor compiler warnings.
Original at URL: https://codereview.chromium.org/810883005 Note that the new code in XFA introduces many more of these, to be handled separately. TBR=brucedawson@chromium.org TBR=thestig@chromium.org BUG=https://code.google.com/p/pdfium/issues/detail?id=102 Review URL: https://codereview.chromium.org/842223004
Diffstat (limited to 'fpdfsdk/include/fsdk_annothandler.h')
-rw-r--r--fpdfsdk/include/fsdk_annothandler.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/fpdfsdk/include/fsdk_annothandler.h b/fpdfsdk/include/fsdk_annothandler.h
index 6aa9412f68..6f2b71b045 100644
--- a/fpdfsdk/include/fsdk_annothandler.h
+++ b/fpdfsdk/include/fsdk_annothandler.h
@@ -306,26 +306,28 @@ 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;