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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2089443002: Convert XFA_ELEMENT to an enum class (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: More unknown checks 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
« no previous file with comments | « xfa/fxfa/parser/xfa_utils.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: xfa/fxfa/parser/xfa_utils_imp.cpp
diff --git a/xfa/fxfa/parser/xfa_utils_imp.cpp b/xfa/fxfa/parser/xfa_utils_imp.cpp
index d644880c4ccc4d2632157fe062f862a7ae26b256..1e6cc1eb44e3899a149c7145685742b11a4ce771 100644
--- a/xfa/fxfa/parser/xfa_utils_imp.cpp
+++ b/xfa/fxfa/parser/xfa_utils_imp.cpp
@@ -16,125 +16,126 @@
#include "xfa/fxfa/parser/xfa_parser.h"
#include "xfa/fxfa/parser/xfa_script.h"
-CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) {
- XFA_ELEMENT eType = pNode->GetClassID();
+CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_Element& eWidgetType) {
+ XFA_Element eType = pNode->GetClassID();
eWidgetType = eType;
- if (eType != XFA_ELEMENT_Field && eType != XFA_ELEMENT_Draw) {
+ if (eType != XFA_Element::Field && eType != XFA_Element::Draw) {
return NULL;
}
- eWidgetType = XFA_ELEMENT_UNKNOWN;
- XFA_ELEMENT eUIType = XFA_ELEMENT_UNKNOWN;
- CXFA_Value defValue(pNode->GetProperty(0, XFA_ELEMENT_Value, TRUE));
- XFA_ELEMENT eValueType = (XFA_ELEMENT)defValue.GetChildValueClassID();
+ eWidgetType = XFA_Element::Unknown;
+ XFA_Element eUIType = XFA_Element::Unknown;
+ CXFA_Value defValue(pNode->GetProperty(0, XFA_Element::Value, TRUE));
+ XFA_Element eValueType = defValue.GetChildValueClassID();
switch (eValueType) {
- case XFA_ELEMENT_Boolean:
- eUIType = XFA_ELEMENT_CheckButton;
+ case XFA_Element::Boolean:
+ eUIType = XFA_Element::CheckButton;
break;
- case XFA_ELEMENT_Integer:
- case XFA_ELEMENT_Decimal:
- case XFA_ELEMENT_Float:
- eUIType = XFA_ELEMENT_NumericEdit;
+ case XFA_Element::Integer:
+ case XFA_Element::Decimal:
+ case XFA_Element::Float:
+ eUIType = XFA_Element::NumericEdit;
break;
- case XFA_ELEMENT_ExData:
- case XFA_ELEMENT_Text:
- eUIType = XFA_ELEMENT_TextEdit;
- eWidgetType = XFA_ELEMENT_Text;
+ case XFA_Element::ExData:
+ case XFA_Element::Text:
+ eUIType = XFA_Element::TextEdit;
+ eWidgetType = XFA_Element::Text;
break;
- case XFA_ELEMENT_Date:
- case XFA_ELEMENT_Time:
- case XFA_ELEMENT_DateTime:
- eUIType = XFA_ELEMENT_DateTimeEdit;
+ case XFA_Element::Date:
+ case XFA_Element::Time:
+ case XFA_Element::DateTime:
+ eUIType = XFA_Element::DateTimeEdit;
break;
- case XFA_ELEMENT_Image:
- eUIType = XFA_ELEMENT_ImageEdit;
- eWidgetType = XFA_ELEMENT_Image;
+ case XFA_Element::Image:
+ eUIType = XFA_Element::ImageEdit;
+ eWidgetType = XFA_Element::Image;
break;
- case XFA_ELEMENT_Arc:
- case XFA_ELEMENT_Line:
- case XFA_ELEMENT_Rectangle:
- eUIType = XFA_ELEMENT_DefaultUi;
+ case XFA_Element::Arc:
+ case XFA_Element::Line:
+ case XFA_Element::Rectangle:
+ eUIType = XFA_Element::DefaultUi;
eWidgetType = eValueType;
break;
default:
break;
}
CXFA_Node* pUIChild = NULL;
- CXFA_Node* pUI = pNode->GetProperty(0, XFA_ELEMENT_Ui, TRUE);
+ CXFA_Node* pUI = pNode->GetProperty(0, XFA_Element::Ui, TRUE);
CXFA_Node* pChild = pUI->GetNodeItem(XFA_NODEITEM_FirstChild);
for (; pChild; pChild = pChild->GetNodeItem(XFA_NODEITEM_NextSibling)) {
- XFA_ELEMENT eChild = pChild->GetClassID();
- if (eChild == XFA_ELEMENT_Extras || eChild == XFA_ELEMENT_Picture) {
+ XFA_Element eChild = pChild->GetClassID();
+ if (eChild == XFA_Element::Extras || eChild == XFA_Element::Picture) {
continue;
}
const XFA_PROPERTY* pProperty =
- XFA_GetPropertyOfElement(XFA_ELEMENT_Ui, eChild, XFA_XDPPACKET_Form);
+ XFA_GetPropertyOfElement(XFA_Element::Ui, eChild, XFA_XDPPACKET_Form);
if (pProperty && (pProperty->uFlags & XFA_PROPERTYFLAG_OneOf)) {
pUIChild = pChild;
break;
}
}
- if (eType == XFA_ELEMENT_Draw) {
- XFA_ELEMENT eDraw = pUIChild ? pUIChild->GetClassID() : XFA_ELEMENT_UNKNOWN;
+ if (eType == XFA_Element::Draw) {
+ XFA_Element eDraw =
+ pUIChild ? pUIChild->GetClassID() : XFA_Element::Unknown;
switch (eDraw) {
- case XFA_ELEMENT_TextEdit:
- eWidgetType = XFA_ELEMENT_Text;
+ case XFA_Element::TextEdit:
+ eWidgetType = XFA_Element::Text;
break;
- case XFA_ELEMENT_ImageEdit:
- eWidgetType = XFA_ELEMENT_Image;
+ case XFA_Element::ImageEdit:
+ eWidgetType = XFA_Element::Image;
break;
default:
- eWidgetType =
- eWidgetType == XFA_ELEMENT_UNKNOWN ? XFA_ELEMENT_Text : eWidgetType;
+ eWidgetType = eWidgetType == XFA_Element::Unknown ? XFA_Element::Text
+ : eWidgetType;
break;
}
} else {
- if (pUIChild && pUIChild->GetClassID() == XFA_ELEMENT_DefaultUi) {
- eWidgetType = XFA_ELEMENT_TextEdit;
+ if (pUIChild && pUIChild->GetClassID() == XFA_Element::DefaultUi) {
+ eWidgetType = XFA_Element::TextEdit;
} else {
- eWidgetType = pUIChild
- ? pUIChild->GetClassID()
- : (eUIType == XFA_ELEMENT_UNKNOWN ? XFA_ELEMENT_TextEdit
- : eUIType);
+ eWidgetType =
+ pUIChild ? pUIChild->GetClassID()
+ : (eUIType == XFA_Element::Unknown ? XFA_Element::TextEdit
+ : eUIType);
}
}
if (!pUIChild) {
- if (eUIType == XFA_ELEMENT_UNKNOWN) {
- eUIType = XFA_ELEMENT_TextEdit;
- defValue.GetNode()->GetProperty(0, XFA_ELEMENT_Text, TRUE);
+ if (eUIType == XFA_Element::Unknown) {
+ eUIType = XFA_Element::TextEdit;
+ defValue.GetNode()->GetProperty(0, XFA_Element::Text, TRUE);
}
pUIChild = pUI->GetProperty(0, eUIType, TRUE);
- } else if (eUIType == XFA_ELEMENT_UNKNOWN) {
+ } else if (eUIType == XFA_Element::Unknown) {
switch (pUIChild->GetClassID()) {
- case XFA_ELEMENT_CheckButton: {
- eValueType = XFA_ELEMENT_Text;
- if (CXFA_Node* pItems = pNode->GetChild(0, XFA_ELEMENT_Items)) {
- if (CXFA_Node* pItem = pItems->GetChild(0, XFA_ELEMENT_UNKNOWN)) {
+ case XFA_Element::CheckButton: {
+ eValueType = XFA_Element::Text;
+ if (CXFA_Node* pItems = pNode->GetChild(0, XFA_Element::Items)) {
+ if (CXFA_Node* pItem = pItems->GetChild(0, XFA_Element::Unknown)) {
eValueType = pItem->GetClassID();
}
}
} break;
- case XFA_ELEMENT_DateTimeEdit:
- eValueType = XFA_ELEMENT_DateTime;
+ case XFA_Element::DateTimeEdit:
+ eValueType = XFA_Element::DateTime;
break;
- case XFA_ELEMENT_ImageEdit:
- eValueType = XFA_ELEMENT_Image;
+ case XFA_Element::ImageEdit:
+ eValueType = XFA_Element::Image;
break;
- case XFA_ELEMENT_NumericEdit:
- eValueType = XFA_ELEMENT_Float;
+ case XFA_Element::NumericEdit:
+ eValueType = XFA_Element::Float;
break;
- case XFA_ELEMENT_ChoiceList: {
+ case XFA_Element::ChoiceList: {
eValueType = (pUIChild->GetEnum(XFA_ATTRIBUTE_Open) ==
XFA_ATTRIBUTEENUM_MultiSelect)
- ? XFA_ELEMENT_ExData
- : XFA_ELEMENT_Text;
+ ? XFA_Element::ExData
+ : XFA_Element::Text;
} break;
- case XFA_ELEMENT_Barcode:
- case XFA_ELEMENT_Button:
- case XFA_ELEMENT_PasswordEdit:
- case XFA_ELEMENT_Signature:
- case XFA_ELEMENT_TextEdit:
+ case XFA_Element::Barcode:
+ case XFA_Element::Button:
+ case XFA_Element::PasswordEdit:
+ case XFA_Element::Signature:
+ case XFA_Element::TextEdit:
default:
- eValueType = XFA_ELEMENT_Text;
+ eValueType = XFA_Element::Text;
break;
}
defValue.GetNode()->GetProperty(0, eValueType, TRUE);
@@ -143,7 +144,7 @@ CXFA_Node* XFA_CreateUIChild(CXFA_Node* pNode, XFA_ELEMENT& eWidgetType) {
}
CXFA_LocaleValue XFA_GetLocaleValue(CXFA_WidgetData* pWidgetData) {
CXFA_Node* pNodeValue =
- pWidgetData->GetNode()->GetChild(0, XFA_ELEMENT_Value);
+ pWidgetData->GetNode()->GetChild(0, XFA_Element::Value);
if (!pNodeValue) {
return CXFA_LocaleValue();
}
@@ -152,30 +153,30 @@ CXFA_LocaleValue XFA_GetLocaleValue(CXFA_WidgetData* pWidgetData) {
return CXFA_LocaleValue();
}
int32_t iVTType = XFA_VT_NULL;
- XFA_ELEMENT eType = pValueChild->GetClassID();
+ XFA_Element eType = pValueChild->GetClassID();
switch (eType) {
- case XFA_ELEMENT_Decimal:
+ case XFA_Element::Decimal:
iVTType = XFA_VT_DECIMAL;
break;
- case XFA_ELEMENT_Float:
+ case XFA_Element::Float:
iVTType = XFA_VT_FLOAT;
break;
- case XFA_ELEMENT_Date:
+ case XFA_Element::Date:
iVTType = XFA_VT_DATE;
break;
- case XFA_ELEMENT_Time:
+ case XFA_Element::Time:
iVTType = XFA_VT_TIME;
break;
- case XFA_ELEMENT_DateTime:
+ case XFA_Element::DateTime:
iVTType = XFA_VT_DATETIME;
break;
- case XFA_ELEMENT_Boolean:
+ case XFA_Element::Boolean:
iVTType = XFA_VT_BOOLEAN;
break;
- case XFA_ELEMENT_Integer:
+ case XFA_Element::Integer:
iVTType = XFA_VT_INTEGER;
break;
- case XFA_ELEMENT_Text:
+ case XFA_Element::Text:
iVTType = XFA_VT_TEXT;
break;
default:
@@ -234,28 +235,28 @@ FX_BOOL XFA_FieldIsMultiListBox(CXFA_Node* pFieldNode) {
if (!pFieldNode) {
return bRet;
}
- CXFA_Node* pUIChild = pFieldNode->GetChild(0, XFA_ELEMENT_Ui);
+ CXFA_Node* pUIChild = pFieldNode->GetChild(0, XFA_Element::Ui);
if (pUIChild) {
CXFA_Node* pFirstChild = pUIChild->GetNodeItem(XFA_NODEITEM_FirstChild);
- if (pFirstChild && pFirstChild->GetClassID() == XFA_ELEMENT_ChoiceList) {
+ if (pFirstChild && pFirstChild->GetClassID() == XFA_Element::ChoiceList) {
bRet = pFirstChild->GetEnum(XFA_ATTRIBUTE_Open) ==
XFA_ATTRIBUTEENUM_MultiSelect;
}
}
return bRet;
}
-FX_BOOL XFA_IsLayoutElement(XFA_ELEMENT eElement, FX_BOOL bLayoutContainer) {
+FX_BOOL XFA_IsLayoutElement(XFA_Element eElement, FX_BOOL bLayoutContainer) {
switch (eElement) {
- case XFA_ELEMENT_Draw:
- case XFA_ELEMENT_Field:
- case XFA_ELEMENT_InstanceManager:
+ case XFA_Element::Draw:
+ case XFA_Element::Field:
+ case XFA_Element::InstanceManager:
return !bLayoutContainer;
- case XFA_ELEMENT_Area:
- case XFA_ELEMENT_Subform:
- case XFA_ELEMENT_ExclGroup:
- case XFA_ELEMENT_SubformSet:
- case XFA_ELEMENT_PageArea:
- case XFA_ELEMENT_Form:
+ case XFA_Element::Area:
+ case XFA_Element::Subform:
+ case XFA_Element::ExclGroup:
+ case XFA_Element::SubformSet:
+ case XFA_Element::PageArea:
+ case XFA_Element::Form:
return TRUE;
default:
return FALSE;
« no previous file with comments | « xfa/fxfa/parser/xfa_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698