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/cxfa_fffield.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xfa/fxfa/cxfa_fffield.cpp') diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index 09ea23f9eb..f6c21d9fd7 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -65,8 +65,7 @@ void CXFA_FFField::RenderWidget(CXFA_Graphics* pGS, mtRotate.Concat(matrix); CXFA_FFWidget::RenderWidget(pGS, mtRotate, dwStatus); - CXFA_Border borderUI = m_pDataAcc->GetUIBorder(); - DrawBorder(pGS, borderUI, m_rtUI, mtRotate); + DrawBorder(pGS, m_pDataAcc->GetUIBorderData(), m_rtUI, mtRotate); RenderCaption(pGS, &mtRotate); DrawHighlight(pGS, &mtRotate, dwStatus, false); @@ -267,9 +266,9 @@ void CXFA_FFField::CapPlacement() { break; } - CXFA_Border borderUI = m_pDataAcc->GetUIBorder(); - if (borderUI) { - CXFA_Margin margin = borderUI.GetMargin(); + CXFA_BorderData borderUIData = m_pDataAcc->GetUIBorderData(); + if (borderUIData) { + CXFA_Margin margin = borderUIData.GetMargin(); if (margin) XFA_RectWidthoutMargin(m_rtUI, margin); } -- cgit v1.2.3