| Index: fpdfsdk/include/fsdk_baseform.h
|
| diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
|
| index b15fba64757aead6c6285bc3e4b915469b206d2b..16a23bfea35f33c9cb78dce875ada41686d8e1a4 100644
|
| --- a/fpdfsdk/include/fsdk_baseform.h
|
| +++ b/fpdfsdk/include/fsdk_baseform.h
|
| @@ -261,32 +261,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;
|
| };
|
|
|
|
|