summaryrefslogtreecommitdiff
path: root/xfa/fxfa/cxfa_widgetacc.cpp
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-11-07 20:59:30 +0000
committerChromium commit bot <commit-bot@chromium.org>2017-11-07 20:59:30 +0000
commit5fe712cb6c605e597f65f6b4cd0afa3213234639 (patch)
tree666bf236e5a213f7baa23fbd1d407baef794942e /xfa/fxfa/cxfa_widgetacc.cpp
parentc3ef52cf3c26d47877740dc46faa3088be44cfae (diff)
downloadpdfium-5fe712cb6c605e597f65f6b4cd0afa3213234639.tar.xz
Rename CXFA_Para to CXFA_ParaData
This CL renames CXFA_Para to CXFA_ParaData to show it is part of the data hierarchy. Change-Id: I71f58c87416b17d1e59252ca374aad13935fc430 Reviewed-on: https://pdfium-review.googlesource.com/17989 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_widgetacc.cpp')
-rw-r--r--xfa/fxfa/cxfa_widgetacc.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index 7453a145b3..681ecbf0f8 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -781,9 +781,9 @@ bool CXFA_WidgetAcc::CalculateWidgetAutoSize(CFX_SizeF& size) {
size.height += fTopInset + fBottomInset;
}
- CXFA_Para para = GetPara();
- if (para)
- size.width += para.GetMarginLeft() + para.GetTextIndent();
+ CXFA_ParaData paraData = GetParaData();
+ if (paraData)
+ size.width += paraData.GetMarginLeft() + paraData.GetTextIndent();
float fVal = 0;
float fMin = 0;
@@ -1245,11 +1245,11 @@ bool CXFA_WidgetAcc::FindSplitPos(int32_t iBlockIndex, float& fCalcHeight) {
if (fHeight > 0.1f && iBlockIndex == 0) {
fStartOffset = fTopInset;
fHeight -= (fTopInset + fBottomInset);
- if (CXFA_Para para = GetPara()) {
- fSpaceAbove = para.GetSpaceAbove();
- float fSpaceBelow = para.GetSpaceBelow();
+ if (CXFA_ParaData paraData = GetParaData()) {
+ fSpaceAbove = paraData.GetSpaceAbove();
+ float fSpaceBelow = paraData.GetSpaceBelow();
fHeight -= (fSpaceAbove + fSpaceBelow);
- switch (para.GetVerticalAlign()) {
+ switch (paraData.GetVerticalAlign()) {
case XFA_ATTRIBUTEENUM_Top:
fStartOffset += fSpaceAbove;
break;
@@ -1512,8 +1512,8 @@ float CXFA_WidgetAcc::GetFontSize() {
float CXFA_WidgetAcc::GetLineHeight() {
float fLineHeight = 0;
- if (CXFA_Para para = GetPara())
- fLineHeight = para.GetLineHeight();
+ if (CXFA_ParaData paraData = GetParaData())
+ fLineHeight = paraData.GetLineHeight();
if (fLineHeight < 1)
fLineHeight = GetFontSize() * 1.2f;
return fLineHeight;