diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-06-20 11:11:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-20 11:11:12 -0700 |
| commit | c5a8f217fedc1224104b34f7577044776a9d83d8 (patch) | |
| tree | 0b457b9ccc3511ad45f75fe0f385425af8d6272d /xfa/fxfa/app/xfa_ffwidgethandler.cpp | |
| parent | 950e68f14aa6db5022919c55ce80f346a94a762e (diff) | |
| download | pdfium-c5a8f217fedc1224104b34f7577044776a9d83d8.tar.xz | |
Split the XFA_OBJECTTYPE enum into two parts.
Currently the object type and the node flags are both mixed into the single
XFA_OBJECTTYPE_* enum. These two things are un-related and should not share
a single type. This Cl creates an XFA_ObjectType enum class and a
XFA_NodeFlag enum to hold the two types.
Accessors are added to determine if the flags are set (or called where they
already existed.
Review-Url: https://codereview.chromium.org/2083453003
Diffstat (limited to 'xfa/fxfa/app/xfa_ffwidgethandler.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidgethandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fxfa/app/xfa_ffwidgethandler.cpp b/xfa/fxfa/app/xfa_ffwidgethandler.cpp index 87ef610882..eeaadc73b2 100644 --- a/xfa/fxfa/app/xfa_ffwidgethandler.cpp +++ b/xfa/fxfa/app/xfa_ffwidgethandler.cpp @@ -235,7 +235,7 @@ int32_t CXFA_FFWidgetHandler::ProcessEvent(CXFA_WidgetAcc* pWidgetAcc, CXFA_Calculate calc = pWidgetAcc->GetCalculate(); if (!calc) return XFA_EVENTERROR_NotExist; - if (pWidgetAcc->GetNode()->HasFlag(XFA_NODEFLAG_UserInteractive)) + if (pWidgetAcc->GetNode()->IsUserInteractive()) return XFA_EVENTERROR_Disabled; CXFA_Script script = calc.GetScript(); @@ -261,8 +261,8 @@ CXFA_FFWidget* CXFA_FFWidgetHandler::CreateWidget(CXFA_FFWidget* hParent, if (!pNewFormItem) return nullptr; - pNewFormItem->GetTemplateNode()->SetFlag(XFA_NODEFLAG_Initialized, true); - pNewFormItem->SetFlag(XFA_NODEFLAG_Initialized, true); + pNewFormItem->GetTemplateNode()->SetFlag(XFA_NodeFlag_Initialized, true); + pNewFormItem->SetFlag(XFA_NodeFlag_Initialized, true); m_pDocView->RunLayout(); CXFA_LayoutItem* pLayout = m_pDocView->GetXFALayout()->GetLayoutItem(pNewFormItem); |