From 41cb62ec84f8e8ca4ce8075fd4d825f8e22292a2 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 23 Jun 2016 09:20:32 -0700 Subject: Cleanup some variable namings. This CL cleans up some variable namings from the XFA_Element enum change. Review-Url: https://codereview.chromium.org/2093663002 --- xfa/fxfa/app/xfa_ffnotify.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'xfa/fxfa/app/xfa_ffnotify.cpp') diff --git a/xfa/fxfa/app/xfa_ffnotify.cpp b/xfa/fxfa/app/xfa_ffnotify.cpp index e4b8312841..12792bc996 100644 --- a/xfa/fxfa/app/xfa_ffnotify.cpp +++ b/xfa/fxfa/app/xfa_ffnotify.cpp @@ -92,7 +92,6 @@ CXFA_LayoutItem* CXFA_FFNotify::OnCreateLayoutItem(CXFA_Node* pNode) { XFA_Element eType = pNode->GetElementType(); if (eType == XFA_Element::PageArea) return new CXFA_FFPageView(pDocView, pNode); - if (eType == XFA_Element::ContentArea) return new CXFA_ContainerLayoutItem(pNode); @@ -320,13 +319,13 @@ void CXFA_FFNotify::OnNodeReady(CXFA_Node* pNode) { if (!pDocView) return; - XFA_Element iType = pNode->GetElementType(); - if (XFA_IsCreateWidget(iType)) { + XFA_Element eType = pNode->GetElementType(); + if (XFA_IsCreateWidget(eType)) { CXFA_WidgetAcc* pAcc = new CXFA_WidgetAcc(pDocView, pNode); pNode->SetObject(XFA_ATTRIBUTE_WidgetData, pAcc, &gs_XFADeleteWidgetAcc); return; } - switch (iType) { + switch (eType) { case XFA_Element::BindItems: pDocView->m_BindItems.Add(pNode); break; @@ -381,7 +380,7 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender, return; } - XFA_Element ePType = pParentNode->GetElementType(); + XFA_Element eType = pParentNode->GetElementType(); FX_BOOL bIsContainerNode = pParentNode->IsContainerNode(); CXFA_WidgetAcc* pWidgetAcc = static_cast(pWidgetNode->GetWidgetData()); @@ -390,7 +389,7 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender, bool bUpdateProperty = false; pDocView->SetChangeMark(); - switch (ePType) { + switch (eType) { case XFA_Element::Caption: { CXFA_TextLayout* pCapOut = pWidgetAcc->GetCaptionTextLayout(); if (!pCapOut) @@ -410,7 +409,7 @@ void CXFA_FFNotify::OnValueChanged(CXFA_Node* pSender, if (eAttr == XFA_ATTRIBUTE_Value) { pDocView->AddCalculateNodeNotify(pSender); - if (ePType == XFA_Element::Value || bIsContainerNode) { + if (eType == XFA_Element::Value || bIsContainerNode) { if (bIsContainerNode) { pWidgetAcc->UpdateUIDisplay(); pDocView->AddCalculateWidgetAcc(pWidgetAcc); -- cgit v1.2.3