diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2018-01-03 12:01:24 -0500 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-01-03 18:20:01 +0000 |
| commit | 39628b04bc86461426f2dcf5a568f5e9e70ad997 (patch) | |
| tree | a0cf6c494a74b83e93a5cc526ab5897a08e3d743 /xfa/fxfa/parser/cxfa_widgetdata.h | |
| parent | 9647614a5dcd00d50aacf4e000fd23a5ebb13931 (diff) | |
| download | pdfium-39628b04bc86461426f2dcf5a568f5e9e70ad997.tar.xz | |
Change CXFA_BoxData to CXFA_Box
This CL renames CXFA_BoxData to CXFA_Box and sets it to inhert from
CXFA_Node instead of CXFA_DataData. The CXFA_BoxData subclasses,
CXFA_RectangleData, CXFA_BorderData and CXFA_ArcData classes are removed
and the nodes now inherit from CXFA_Box.
Change-Id: Ia0df7d56535b5d90be29f040180a5d5fc55a64e0
Reviewed-on: https://pdfium-review.googlesource.com/22091
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_widgetdata.h')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h index e2dbfbfafd..d8dee8a2a3 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.h +++ b/xfa/fxfa/parser/cxfa_widgetdata.h @@ -15,7 +15,6 @@ #include "core/fxcrt/fx_system.h" #include "fxbarcode/BC_Library.h" #include "xfa/fxfa/parser/cxfa_binddata.h" -#include "xfa/fxfa/parser/cxfa_borderdata.h" #include "xfa/fxfa/parser/cxfa_captiondata.h" #include "xfa/fxfa/parser/cxfa_datadata.h" #include "xfa/fxfa/parser/cxfa_fontdata.h" @@ -33,6 +32,7 @@ enum XFA_VALUEPICTURE { XFA_VALUEPICTURE_DataBind, }; +class CXFA_Border; class CXFA_Calculate; class CXFA_Margin; class CXFA_Node; @@ -58,7 +58,7 @@ class CXFA_WidgetData : public CXFA_DataData { bool IsChoiceListAllowTextEntry(); bool IsMultiLine(); - CXFA_BorderData GetBorderData(bool bModified); + CXFA_Border* GetBorder(bool bModified); CXFA_CaptionData GetCaptionData(); CXFA_FontData GetFontData(bool bModified); CXFA_Margin* GetMargin(); @@ -67,7 +67,7 @@ class CXFA_WidgetData : public CXFA_DataData { CXFA_Value* GetFormValue(); CXFA_Calculate* GetCalculate(); CXFA_Validate* GetValidate(bool bModified); - CXFA_BorderData GetUIBorderData(); + CXFA_Border* GetUIBorder(); std::vector<CXFA_Node*> GetEventByActivity(XFA_AttributeEnum iActivity, bool bIsFormReady); |