From 9a2c6552460c82417de13e86f07e23dc8c8cef74 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 14 Dec 2017 21:14:14 +0000 Subject: Fold CXFA_ParaData into CXFA_Para This CL removes the CXFA_ParaData wrapper and folds the code into CXFA_Para. Change-Id: I86d139f1df48dcc80d28c7516b1bda95a59e94bd Reviewed-on: https://pdfium-review.googlesource.com/21270 Reviewed-by: Henrique Nakashima Commit-Queue: dsinclair --- xfa/fxfa/cxfa_fftextedit.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/cxfa_fftextedit.cpp') diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp index ea9e4dbe36..bf25b8bfb3 100644 --- a/xfa/fxfa/cxfa_fftextedit.cpp +++ b/xfa/fxfa/cxfa_fftextedit.cpp @@ -20,6 +20,7 @@ #include "xfa/fxfa/cxfa_ffapp.h" #include "xfa/fxfa/cxfa_ffdoc.h" #include "xfa/fxfa/parser/cxfa_node.h" +#include "xfa/fxfa/parser/cxfa_para.h" namespace { @@ -214,12 +215,12 @@ bool CXFA_FFTextEdit::IsDataChanged() { } uint32_t CXFA_FFTextEdit::GetAlignment() { - CXFA_ParaData paraData = m_pDataAcc->GetParaData(); - if (!paraData.HasValidNode()) + CXFA_Para* para = m_pDataAcc->GetPara(); + if (!para) return 0; uint32_t dwExtendedStyle = 0; - switch (paraData.GetHorizontalAlign()) { + switch (para->GetHorizontalAlign()) { case XFA_AttributeEnum::Center: dwExtendedStyle |= FWL_STYLEEXT_EDT_HCenter; break; @@ -237,7 +238,7 @@ uint32_t CXFA_FFTextEdit::GetAlignment() { break; } - switch (paraData.GetVerticalAlign()) { + switch (para->GetVerticalAlign()) { case XFA_AttributeEnum::Middle: dwExtendedStyle |= FWL_STYLEEXT_EDT_VCenter; break; -- cgit v1.2.3