Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(263)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp

Issue 2093663002: Cleanup some variable namings. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« xfa/fxfa/parser/xfa_document_datamerger_imp.cpp ('K') | « xfa/fxfa/parser/xfa_layout_itemlayout.cpp ('k') | xfa/fxfa/parser/xfa_object.h » ('j') | xfa/fxfa/parser/xfa_object_imp.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
diff --git a/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp b/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
index f5a38325948a730799102a4dda65879cc458b6f6..36e72dbd2def575182331a11be46c2bc9680946c 100644
--- a/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
+++ b/xfa/fxfa/parser/xfa_layout_pagemgr_new.cpp
@@ -1782,9 +1782,8 @@ void CXFA_LayoutPageMgr::MergePageSetContents() {
while (pNode) {
if (pNode->IsUnusedNode()) {
if (pNode->IsContainerNode()) {
- XFA_Element eCurId = pNode->GetElementType();
- if (eCurId == XFA_Element::PageArea ||
- eCurId == XFA_Element::PageSet) {
+ XFA_Element eType = pNode->GetElementType();
+ if (eType == XFA_Element::PageArea || eType == XFA_Element::PageSet) {
CXFA_ContainerIterator iteChild(pNode);
CXFA_Node* pChildNode = iteChild.MoveToNext();
for (; pChildNode; pChildNode = iteChild.MoveToNext()) {
@@ -1795,7 +1794,7 @@ void CXFA_LayoutPageMgr::MergePageSetContents() {
delete pLayoutItem;
}
}
- } else if (eCurId != XFA_Element::ContentArea) {
+ } else if (eType != XFA_Element::ContentArea) {
CXFA_LayoutItem* pLayoutItem = static_cast<CXFA_LayoutItem*>(
pNode->GetUserData(XFA_LAYOUTITEMKEY));
if (pLayoutItem) {
« xfa/fxfa/parser/xfa_document_datamerger_imp.cpp ('K') | « xfa/fxfa/parser/xfa_layout_itemlayout.cpp ('k') | xfa/fxfa/parser/xfa_object.h » ('j') | xfa/fxfa/parser/xfa_object_imp.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698