diff options
Diffstat (limited to 'xfa/fxfa/cxfa_fffield.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_fffield.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp index e9a3c49c5c..ce8e70ea0c 100644 --- a/xfa/fxfa/cxfa_fffield.cpp +++ b/xfa/fxfa/cxfa_fffield.cpp @@ -212,7 +212,7 @@ void CXFA_FFField::CapPlacement() { m_rtCaption.height += pItem->GetRect(false).Height(); pItem = pItem->GetNext(); } - XFA_RectWithoutMargin(m_rtCaption, margin); + XFA_RectWithoutMargin(&m_rtCaption, margin); } CXFA_TextLayout* pCapTextLayout = m_pNode->GetCaptionTextLayout(); @@ -270,8 +270,7 @@ void CXFA_FFField::CapPlacement() { CXFA_Border* borderUI = m_pNode->GetUIBorder(); if (borderUI) { CXFA_Margin* borderMargin = borderUI->GetMarginIfExists(); - if (borderMargin) - XFA_RectWithoutMargin(m_rtUI, borderMargin); + XFA_RectWithoutMargin(&m_rtUI, borderMargin); } m_rtUI.Normalize(); } @@ -282,7 +281,7 @@ void CXFA_FFField::CapTopBottomPlacement(const CXFA_Margin* margin, CFX_RectF rtUIMargin = m_pNode->GetUIMargin(); m_rtCaption.left += rtUIMargin.left; if (margin) { - XFA_RectWithoutMargin(m_rtCaption, margin); + XFA_RectWithoutMargin(&m_rtCaption, margin); if (m_rtCaption.height < 0) m_rtCaption.top += m_rtCaption.height; } @@ -309,7 +308,7 @@ void CXFA_FFField::CapLeftRightPlacement(const CXFA_Margin* margin, m_rtCaption.top += rtUIMargin.top; m_rtCaption.height -= rtUIMargin.top; if (margin) { - XFA_RectWithoutMargin(m_rtCaption, margin); + XFA_RectWithoutMargin(&m_rtCaption, margin); if (m_rtCaption.height < 0) m_rtCaption.top += m_rtCaption.height; } |