diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
| commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
| tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /core/src/reflow/autoreflow.h | |
| parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
| download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz | |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'core/src/reflow/autoreflow.h')
| -rw-r--r-- | core/src/reflow/autoreflow.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/src/reflow/autoreflow.h b/core/src/reflow/autoreflow.h index d98f33bf4e..6a137e9ae2 100644 --- a/core/src/reflow/autoreflow.h +++ b/core/src/reflow/autoreflow.h @@ -12,7 +12,7 @@ class CPDF_AutoReflowElement; class CPDF_AutoReflowLayoutProvider; typedef CFX_ArrayTemplate<CPDF_AutoReflowElement*> CAR_ElmPtrArray; typedef CFX_ArrayTemplate<CPDF_PageObject*> CAR_ObjPtrArray; -class CRF_CELL : public CFX_Object +class CRF_CELL { public: CRF_CELL() { }; @@ -21,7 +21,7 @@ public: int m_CellWritingMode; FX_RECT m_BBox; }; -class CPDF_AutoReflowElement : public IPDF_LayoutElement, public CFX_Object +class CPDF_AutoReflowElement : public IPDF_LayoutElement { public: CPDF_AutoReflowElement(LayoutType layoutType = LayoutUnknown , CPDF_AutoReflowElement* pParent = NULL) ; @@ -68,7 +68,7 @@ public: #define AUTOREFLOW_STEP_GENERATEParagraph 2 #define AUTOREFLOW_STEP_CREATEELEMENT 3 #define AUTOREFLOW_STEP_REMOVEDATA 4 -class CPDF_AutoReflowLayoutProvider : public IPDF_LayoutProvider, public CFX_Object +class CPDF_AutoReflowLayoutProvider : public IPDF_LayoutProvider { public: CPDF_AutoReflowLayoutProvider(CPDF_PageObjects* pPage, FX_BOOL bReadOrder); |