diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-07 20:49:20 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-07 20:49:20 +0000 |
| commit | 2a69b9ef97ddf46fe01de432bd0ccc1b7ce92bcb (patch) | |
| tree | d0138d82b52cc63e0956a12faebf6433dd9303fd /xfa/fxfa/parser/cxfa_widgetdata.cpp | |
| parent | c5a729ec5ada8ef0edc3f4d9976e96865f516598 (diff) | |
| download | pdfium-2a69b9ef97ddf46fe01de432bd0ccc1b7ce92bcb.tar.xz | |
Rename CXFA_Margin to CXFA_MarginData
This CL renames CXFA_Margin to CXFA_MarginData to reflect the fact this
is part of the data hierarchy.
Change-Id: I50d82d01fcaf35c621f13b8b68bc04d850ec885a
Reviewed-on: https://pdfium-review.googlesource.com/17986
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_widgetdata.cpp')
| -rw-r--r-- | xfa/fxfa/parser/cxfa_widgetdata.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp index 305ead26d9..5edbc7fad4 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.cpp +++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp @@ -294,8 +294,8 @@ CXFA_FontData CXFA_WidgetData::GetFontData(bool bModified) { m_pNode->JSNode()->GetProperty(0, XFA_Element::Font, bModified)); } -CXFA_Margin CXFA_WidgetData::GetMargin() { - return CXFA_Margin( +CXFA_MarginData CXFA_WidgetData::GetMarginData() { + return CXFA_MarginData( m_pNode->JSNode()->GetProperty(0, XFA_Element::Margin, false)); } @@ -396,10 +396,11 @@ CXFA_BorderData CXFA_WidgetData::GetUIBorderData() { CFX_RectF CXFA_WidgetData::GetUIMargin() { CXFA_Node* pUIChild = GetUIChild(); - CXFA_Margin mgUI = CXFA_Margin( - pUIChild ? pUIChild->JSNode()->GetProperty(0, XFA_Element::Margin, false) - : nullptr); + if (!pUIChild) + return CFX_RectF(); + CXFA_MarginData mgUI = CXFA_MarginData( + pUIChild->JSNode()->GetProperty(0, XFA_Element::Margin, false)); if (!mgUI) return CFX_RectF(); |