Remove unneeded CPVT classes. (try 2)

core/fpdfdoc/ctypeset.h

Index: core/fpdfdoc/ctypeset.h
diff --git a/core/fpdfdoc/ctypeset.h b/core/fpdfdoc/ctypeset.h
index 25bb31a80179a229faaf5741f7d510ce3a9b5e15..e9365218058ae3d2b901e2766f62e578618ccf49 100644
--- a/core/fpdfdoc/ctypeset.h
+++ b/core/fpdfdoc/ctypeset.h
@@ -16,17 +16,20 @@ class CSection;
 class CTypeset {
  public:
   explicit CTypeset(CSection* pSection);
-  virtual ~CTypeset();
-  CPVT_Size GetEditSize(FX_FLOAT fFontSize);
+  ~CTypeset();
+
+  CFX_PointF GetEditSize(FX_FLOAT fFontSize);
   CPVT_FloatRect Typeset();
   CPVT_FloatRect CharArray();
 
  private:
   void SplitLines(FX_BOOL bTypeset, FX_FLOAT fFontSize);
   void OutputLines();
+  FX_FLOAT GetXPosForAlignment(FX_FLOAT fTypesetWidth,
+                               FX_FLOAT fLineWidth) const;
 
   CPVT_FloatRect m_rcRet;
-  CPDF_VariableText* m_pVT;
+  CPDF_VariableText* const m_pVT;
   CSection* const m_pSection;
 };