diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-13 10:16:05 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-13 15:46:47 +0000 |
| commit | 575898e6251c1dbb8de0d40a5b6ce90762aa2af2 (patch) | |
| tree | c9b30307e04200c2621bfd98e4152c47653efcb6 /xfa/fde/cfde_txtedtpage.h | |
| parent | 068d34426272bd7f02ffc12139ddd33ee2e237e6 (diff) | |
| download | pdfium-575898e6251c1dbb8de0d40a5b6ce90762aa2af2.tar.xz | |
Remove some single use interfaces
Remove interfaces which are only implemented once.
Change-Id: I73ceaa7bfd7ef2a630479c7eebed5e32ecb99940
Reviewed-on: https://pdfium-review.googlesource.com/2944
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fde/cfde_txtedtpage.h')
| -rw-r--r-- | xfa/fde/cfde_txtedtpage.h | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/xfa/fde/cfde_txtedtpage.h b/xfa/fde/cfde_txtedtpage.h index 63ec7e7cf3..6d700d202c 100644 --- a/xfa/fde/cfde_txtedtpage.h +++ b/xfa/fde/cfde_txtedtpage.h @@ -11,52 +11,46 @@ #include <memory> #include <vector> -#include "xfa/fde/ifde_txtedtpage.h" +#include "xfa/fde/fde_visualset.h" #include "xfa/fde/ifx_chariter.h" class CFDE_TxtEdtEngine; class CFDE_TxtEdtParag; class CFDE_TxtEdtTextSet; -class CFDE_TxtEdtPage : public IFDE_TxtEdtPage { +class CFDE_TxtEdtPage : public IFDE_VisualSet { public: CFDE_TxtEdtPage(CFDE_TxtEdtEngine* pEngine, int32_t nLineIndex); ~CFDE_TxtEdtPage() override; - // IFDE_TxtEditPage: - CFDE_TxtEdtEngine* GetEngine() const override; + // IFDE_VisualSet: + FDE_VISUALOBJTYPE GetType() override; + CFX_RectF GetRect(const FDE_TEXTEDITPIECE& pPiece) override; + + CFDE_TxtEdtEngine* GetEngine() const; int32_t GetCharRect(int32_t nIndex, CFX_RectF& rect, - bool bBBox = false) const override; - int32_t GetCharIndex(const CFX_PointF& fPoint, bool& bBefore) override; + bool bBBox = false) const; + int32_t GetCharIndex(const CFX_PointF& fPoint, bool& bBefore); void CalcRangeRectArray(int32_t nStart, int32_t nCount, - std::vector<CFX_RectF>* RectFArr) const override; - int32_t SelectWord(const CFX_PointF& fPoint, int32_t& nCount) override; - int32_t GetCharStart() const override; - int32_t GetCharCount() const override; + std::vector<CFX_RectF>* RectFArr) const; + int32_t SelectWord(const CFX_PointF& fPoint, int32_t& nCount); + int32_t GetCharStart() const; + int32_t GetCharCount() const; int32_t GetDisplayPos(const CFX_RectF& rtClip, FXTEXT_CHARPOS*& pCharPos, - CFX_RectF* pBBox) const override; - bool IsLoaded(const CFX_RectF* pClipBox) override; - int32_t LoadPage(const CFX_RectF* pClipBox, IFX_Pause* pPause) override; - void UnloadPage(const CFX_RectF* pClipBox) override; - const CFX_RectF& GetContentsBox() override; - - // IFDE_VisualSet: - FDE_VISUALOBJTYPE GetType() override; - CFX_RectF GetRect(const FDE_TEXTEDITPIECE& pPiece) override; + CFX_RectF* pBBox) const; + bool IsLoaded(const CFX_RectF* pClipBox); + int32_t LoadPage(const CFX_RectF* pClipBox, IFX_Pause* pPause); + void UnloadPage(const CFX_RectF* pClipBox); + const CFX_RectF& GetContentsBox(); - // IFDE_CanvasSet: - FX_POSITION GetFirstPosition() override; - FDE_TEXTEDITPIECE* GetNext(FX_POSITION& pos, - IFDE_VisualSet*& pVisualSet) override; + FX_POSITION GetFirstPosition(); + FDE_TEXTEDITPIECE* GetNext(FX_POSITION& pos, IFDE_VisualSet*& pVisualSet); - // IFX_TxtAccess: - FX_WCHAR GetChar(const FDE_TEXTEDITPIECE* pIdentity, - int32_t index) const override; - int32_t GetWidth(const FDE_TEXTEDITPIECE* pIdentity, - int32_t index) const override; + FX_WCHAR GetChar(const FDE_TEXTEDITPIECE* pIdentity, int32_t index) const; + int32_t GetWidth(const FDE_TEXTEDITPIECE* pIdentity, int32_t index) const; private: void NormalizePt2Rect(CFX_PointF& ptF, |