diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-20 13:38:38 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-20 13:38:38 -0700 |
| commit | 19ae17578f99621100a26dac3e2c7c3dbf7c7cd1 (patch) | |
| tree | 0ac0a753395a88ae5f733a8fb465e8b50bfdc26c /fpdfsdk/include/fsdk_baseform.h | |
| parent | bc580c69403169afa656aabb06a56b26d3b729cf (diff) | |
| download | pdfium-19ae17578f99621100a26dac3e2c7c3dbf7c7cd1.tar.xz | |
Remove release method from CBA_AnnotItetator.chromium/2377
Also remove virtual methods, since this is neither subclassed nor a
subclass.
BUG=https://code.google.com/p/pdfium/issues/detail?id=140
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1097843003
Diffstat (limited to 'fpdfsdk/include/fsdk_baseform.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_baseform.h | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index b15fba6475..16a23bfea3 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; }; |