diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-12-14 21:14:14 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-12-14 21:14:14 +0000 |
| commit | 9a2c6552460c82417de13e86f07e23dc8c8cef74 (patch) | |
| tree | 9b1971968c9d371b226457090ab0f73efe45bca4 /xfa/fxfa/cxfa_ffcombobox.cpp | |
| parent | 8eb2722e764fff0a39d0d1dc0c59473aa938b31f (diff) | |
| download | pdfium-9a2c6552460c82417de13e86f07e23dc8c8cef74.tar.xz | |
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 <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffcombobox.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffcombobox.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xfa/fxfa/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp index cc5569ea85..706c430717 100644 --- a/xfa/fxfa/cxfa_ffcombobox.cpp +++ b/xfa/fxfa/cxfa_ffcombobox.cpp @@ -14,6 +14,7 @@ #include "xfa/fwl/cfwl_notedriver.h" #include "xfa/fxfa/cxfa_eventparam.h" #include "xfa/fxfa/cxfa_ffdocview.h" +#include "xfa/fxfa/parser/cxfa_para.h" namespace { @@ -139,12 +140,12 @@ void CXFA_FFComboBox::FWLEventSelChange(CXFA_EventParam* pParam) { } uint32_t CXFA_FFComboBox::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_CMB_EditHCenter | FWL_STYLEEXT_CMB_ListItemCenterAlign; @@ -164,7 +165,7 @@ uint32_t CXFA_FFComboBox::GetAlignment() { break; } - switch (paraData.GetVerticalAlign()) { + switch (para->GetVerticalAlign()) { case XFA_AttributeEnum::Middle: dwExtendedStyle |= FWL_STYLEEXT_CMB_EditVCenter; break; |