diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-11-07 18:44:51 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-11-07 18:44:51 +0000 |
| commit | 0a9b0a15133370657a2f3e13f062028c17a3dc0b (patch) | |
| tree | 37ae48dbc880c6ff38a4a8ee3f7e1f6a33a050a3 /xfa/fxfa/cxfa_ffpushbutton.cpp | |
| parent | f44cf89c0263708b7d475fb1aeba6ba42f54766f (diff) | |
| download | pdfium-0a9b0a15133370657a2f3e13f062028c17a3dc0b.tar.xz | |
Rename CXFA_Caption to CXFA_CaptionData
This CL renames CXFA_Caption to CXFA_CaptionData to make it clear it's
part of the data hierarchy.
Change-Id: I0268005e12a6b58aed7274bf9d023887119a8a63
Reviewed-on: https://pdfium-review.googlesource.com/17977
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffpushbutton.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffpushbutton.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp index 7c532fc01f..9ec48b865d 100644 --- a/xfa/fxfa/cxfa_ffpushbutton.cpp +++ b/xfa/fxfa/cxfa_ffpushbutton.cpp @@ -100,9 +100,9 @@ bool CXFA_FFPushButton::PerformLayout() { if (CXFA_Margin mgWidget = m_pDataAcc->GetMargin()) XFA_RectWidthoutMargin(rtWidget, mgWidget); - CXFA_Caption caption = m_pDataAcc->GetCaption(); + CXFA_CaptionData captionData = m_pDataAcc->GetCaptionData(); m_rtCaption = rtWidget; - if (CXFA_Margin mgCap = caption.GetMargin()) + if (CXFA_Margin mgCap = captionData.GetMargin()) XFA_RectWidthoutMargin(m_rtCaption, mgCap); LayoutHighlightCaption(); @@ -130,8 +130,8 @@ FX_ARGB CXFA_FFPushButton::GetFillColor() { } void CXFA_FFPushButton::LoadHighlightCaption() { - CXFA_Caption caption = m_pDataAcc->GetCaption(); - if (!caption || caption.GetPresence() == XFA_ATTRIBUTEENUM_Hidden) + CXFA_CaptionData captionData = m_pDataAcc->GetCaptionData(); + if (!captionData || captionData.GetPresence() == XFA_ATTRIBUTEENUM_Hidden) return; bool bRichText; @@ -167,8 +167,8 @@ void CXFA_FFPushButton::LayoutHighlightCaption() { void CXFA_FFPushButton::RenderHighlightCaption(CXFA_Graphics* pGS, CFX_Matrix* pMatrix) { CXFA_TextLayout* pCapTextLayout = m_pDataAcc->GetCaptionTextLayout(); - CXFA_Caption caption = m_pDataAcc->GetCaption(); - if (!caption || caption.GetPresence() != XFA_ATTRIBUTEENUM_Visible) + CXFA_CaptionData captionData = m_pDataAcc->GetCaptionData(); + if (!captionData || captionData.GetPresence() != XFA_ATTRIBUTEENUM_Visible) return; CFX_RenderDevice* pRenderDevice = pGS->GetRenderDevice(); |