From 50132e522702dd016b83ed12e91d065357fe0b59 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 7 Nov 2017 18:40:35 +0000 Subject: Rename CXFA_Border to CXFA_BorderData This CL renames CXFA_Border to CXFA_BorderData to make it clear it's part of the Data hierarchy. Change-Id: Icfe8dc07d527ba54413f073f5a444fb7b2a71271 Reviewed-on: https://pdfium-review.googlesource.com/17974 Reviewed-by: Tom Sepez Commit-Queue: dsinclair --- xfa/fxfa/parser/cxfa_widgetdata.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_widgetdata.h') diff --git a/xfa/fxfa/parser/cxfa_widgetdata.h b/xfa/fxfa/parser/cxfa_widgetdata.h index deeb51d9ce..f741a33858 100644 --- a/xfa/fxfa/parser/cxfa_widgetdata.h +++ b/xfa/fxfa/parser/cxfa_widgetdata.h @@ -14,7 +14,7 @@ #include "core/fxcrt/fx_system.h" #include "xfa/fxfa/parser/cxfa_assistdata.h" #include "xfa/fxfa/parser/cxfa_binddata.h" -#include "xfa/fxfa/parser/cxfa_border.h" +#include "xfa/fxfa/parser/cxfa_borderdata.h" #include "xfa/fxfa/parser/cxfa_calculate.h" #include "xfa/fxfa/parser/cxfa_caption.h" #include "xfa/fxfa/parser/cxfa_data.h" @@ -50,7 +50,7 @@ class CXFA_WidgetData : public CXFA_Data { int32_t GetRotate(); CXFA_AssistData GetAssistData(); - CXFA_Border GetBorder(bool bModified); + CXFA_BorderData GetBorderData(bool bModified); CXFA_Caption GetCaption(); CXFA_Font GetFont(bool bModified); CXFA_Margin GetMargin(); @@ -70,7 +70,7 @@ class CXFA_WidgetData : public CXFA_Data { bool GetMaxWidth(float& fMaxWidth); bool GetMaxHeight(float& fMaxHeight); - CXFA_Border GetUIBorder(); + CXFA_BorderData GetUIBorderData(); CFX_RectF GetUIMargin(); int32_t GetButtonHighlight(); bool GetButtonRollover(WideString& wsRollover, bool& bRichText); -- cgit v1.2.3