Index: core/fpdfdoc/pdf_vt.h |
diff --git a/core/fpdfdoc/pdf_vt.h b/core/fpdfdoc/pdf_vt.h |
index 3f06f7d6d676e35183535dfa0bbb55dd8d7440c0..71e28daad95470cfc08984da156298e0c94a9f81 100644 |
--- a/core/fpdfdoc/pdf_vt.h |
+++ b/core/fpdfdoc/pdf_vt.h |
@@ -49,54 +49,16 @@ class CLine final { |
CPVT_LineInfo m_LineInfo; |
}; |
-class CLines final { |
- public: |
- CLines() : m_nTotal(0) {} |
- ~CLines() { RemoveAll(); } |
- |
- int32_t GetSize() const { return m_Lines.GetSize(); } |
- CLine* GetAt(int32_t nIndex) const { return m_Lines.GetAt(nIndex); } |
- void Empty() { m_nTotal = 0; } |
- void RemoveAll() { |
- for (int32_t i = 0, sz = GetSize(); i < sz; i++) { |
- delete GetAt(i); |
- } |
- m_Lines.RemoveAll(); |
- m_nTotal = 0; |
- } |
- int32_t Add(const CPVT_LineInfo& lineinfo) { |
- if (m_nTotal >= GetSize()) { |
- CLine* pLine = new CLine; |
- pLine->m_LineInfo = lineinfo; |
- m_Lines.Add(pLine); |
- } else if (CLine* pLine = GetAt(m_nTotal)) { |
- pLine->m_LineInfo = lineinfo; |
- } |
- return m_nTotal++; |
- } |
- void Clear() { |
- for (int32_t i = GetSize() - 1; i >= m_nTotal; i--) { |
- delete GetAt(i); |
- m_Lines.RemoveAt(i); |
- } |
- } |
- |
- private: |
- CPVT_ArrayTemplate<CLine*> m_Lines; |
- int32_t m_nTotal; |
-}; |
- |
class CPDF_EditContainer { |
public: |
- CPDF_EditContainer() : m_rcPlate(0, 0, 0, 0), m_rcContent(0, 0, 0, 0) {} |
- virtual ~CPDF_EditContainer() {} |
+ CPDF_EditContainer(); |
+ virtual ~CPDF_EditContainer(); |
+ |
+ virtual void SetPlateRect(const CFX_FloatRect& rect); |
+ virtual const CFX_FloatRect& GetPlateRect() const; |
+ virtual void SetContentRect(const CPVT_FloatRect& rect); |
+ virtual CFX_FloatRect GetContentRect() const; |
- virtual void SetPlateRect(const CFX_FloatRect& rect) { m_rcPlate = rect; } |
- virtual const CFX_FloatRect& GetPlateRect() const { return m_rcPlate; } |
- virtual void SetContentRect(const CPVT_FloatRect& rect) { |
- m_rcContent = rect; |
- } |
- virtual CFX_FloatRect GetContentRect() const { return m_rcContent; } |
FX_FLOAT GetPlateWidth() const { return m_rcPlate.right - m_rcPlate.left; } |
FX_FLOAT GetPlateHeight() const { return m_rcPlate.top - m_rcPlate.bottom; } |
CFX_SizeF GetPlateSize() const { |
@@ -108,20 +70,20 @@ class CPDF_EditContainer { |
CFX_FloatPoint GetETPoint() const { |
return CFX_FloatPoint(m_rcPlate.right, m_rcPlate.bottom); |
} |
- inline CFX_FloatPoint InToOut(const CFX_FloatPoint& point) const { |
+ CFX_FloatPoint InToOut(const CFX_FloatPoint& point) const { |
return CFX_FloatPoint(point.x + GetBTPoint().x, GetBTPoint().y - point.y); |
} |
- inline CFX_FloatPoint OutToIn(const CFX_FloatPoint& point) const { |
+ CFX_FloatPoint OutToIn(const CFX_FloatPoint& point) const { |
return CFX_FloatPoint(point.x - GetBTPoint().x, GetBTPoint().y - point.y); |
} |
- inline CFX_FloatRect InToOut(const CPVT_FloatRect& rect) const { |
+ CFX_FloatRect InToOut(const CPVT_FloatRect& rect) const { |
CFX_FloatPoint ptLeftTop = InToOut(CFX_FloatPoint(rect.left, rect.top)); |
CFX_FloatPoint ptRightBottom = |
InToOut(CFX_FloatPoint(rect.right, rect.bottom)); |
return CFX_FloatRect(ptLeftTop.x, ptRightBottom.y, ptRightBottom.x, |
ptLeftTop.y); |
} |
- inline CPVT_FloatRect OutToIn(const CFX_FloatRect& rect) const { |
+ CPVT_FloatRect OutToIn(const CFX_FloatRect& rect) const { |
CFX_FloatPoint ptLeftTop = OutToIn(CFX_FloatPoint(rect.left, rect.top)); |
CFX_FloatPoint ptRightBottom = |
OutToIn(CFX_FloatPoint(rect.right, rect.bottom)); |