summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xfa/fxfa/cxfa_ffcheckbutton.cpp2
-rw-r--r--xfa/fxfa/cxfa_fffield.cpp2
-rw-r--r--xfa/fxfa/cxfa_ffpageview.cpp6
-rw-r--r--xfa/fxfa/cxfa_widgetacc.cpp3
-rw-r--r--xfa/fxfa/parser/cxfa_node.cpp2
-rw-r--r--xfa/fxfa/parser/cxfa_node.h2
6 files changed, 9 insertions, 8 deletions
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index 3fd1d88987..2f79408e74 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -312,7 +312,7 @@ void CXFA_FFCheckButton::OnProcessEvent(CFWL_Event* pEvent) {
eParam.m_wsNewText =
m_pNode->GetWidgetAcc()->GetValue(XFA_VALUEPICTURE_Raw);
- CXFA_Node* exclNode = m_pNode->GetExclGroup();
+ CXFA_Node* exclNode = m_pNode->GetExclGroupIfExists();
if (ProcessCommittedData()) {
eParam.m_pTarget = exclNode ? exclNode->GetWidgetAcc() : nullptr;
if (exclNode) {
diff --git a/xfa/fxfa/cxfa_fffield.cpp b/xfa/fxfa/cxfa_fffield.cpp
index 9f885bb3ce..53a81bdad9 100644
--- a/xfa/fxfa/cxfa_fffield.cpp
+++ b/xfa/fxfa/cxfa_fffield.cpp
@@ -636,7 +636,7 @@ bool CXFA_FFField::ProcessCommittedData() {
}
int32_t CXFA_FFField::CalculateOverride() {
- CXFA_Node* exclNode = m_pNode->GetExclGroup();
+ CXFA_Node* exclNode = m_pNode->GetExclGroupIfExists();
if (!exclNode)
return CalculateWidgetAcc(m_pNode->GetWidgetAcc());
diff --git a/xfa/fxfa/cxfa_ffpageview.cpp b/xfa/fxfa/cxfa_ffpageview.cpp
index 39f4dbe03b..53b39fd3fa 100644
--- a/xfa/fxfa/cxfa_ffpageview.cpp
+++ b/xfa/fxfa/cxfa_ffpageview.cpp
@@ -351,12 +351,12 @@ void CXFA_FFTabOrderPageWidgetIterator::CreateTabOrderWidgetArray() {
? it - SpaceOrderWidgetArray.begin() + 1
: 0;
while (true) {
- CXFA_FFWidget* pRadio =
+ CXFA_FFWidget* radio =
SpaceOrderWidgetArray[iWidgetIndex % nWidgetCount];
- if (pRadio->GetNode()->GetExclGroup() != pWidgetAcc->GetNode())
+ if (radio->GetNode()->GetExclGroupIfExists() != pWidgetAcc->GetNode())
break;
if (!pdfium::ContainsValue(m_TabOrderWidgetArray, hWidget))
- m_TabOrderWidgetArray.push_back(pRadio);
+ m_TabOrderWidgetArray.push_back(radio);
iWidgetIndex++;
}
diff --git a/xfa/fxfa/cxfa_widgetacc.cpp b/xfa/fxfa/cxfa_widgetacc.cpp
index 5a925da833..39aa378a52 100644
--- a/xfa/fxfa/cxfa_widgetacc.cpp
+++ b/xfa/fxfa/cxfa_widgetacc.cpp
@@ -1486,7 +1486,7 @@ XFA_CHECKSTATE CXFA_WidgetAcc::GetCheckState() {
}
void CXFA_WidgetAcc::SetCheckState(XFA_CHECKSTATE eCheckState, bool bNotify) {
- CXFA_Node* node = m_pNode->GetExclGroup();
+ CXFA_Node* node = m_pNode->GetExclGroupIfExists();
if (!node) {
CXFA_Items* pItems =
m_pNode->GetChild<CXFA_Items>(0, XFA_Element::Items, false);
@@ -1506,6 +1506,7 @@ void CXFA_WidgetAcc::SetCheckState(XFA_CHECKSTATE eCheckState, bool bNotify) {
}
if (m_pNode)
m_pNode->SyncValue(wsContent, bNotify);
+
return;
}
diff --git a/xfa/fxfa/parser/cxfa_node.cpp b/xfa/fxfa/parser/cxfa_node.cpp
index 075ee46836..5d72cf7cb9 100644
--- a/xfa/fxfa/parser/cxfa_node.cpp
+++ b/xfa/fxfa/parser/cxfa_node.cpp
@@ -1654,7 +1654,7 @@ Optional<float> CXFA_Node::TryMaxHeight() {
return JSObject()->TryMeasureAsFloat(XFA_Attribute::MaxH);
}
-CXFA_Node* CXFA_Node::GetExclGroup() {
+CXFA_Node* CXFA_Node::GetExclGroupIfExists() {
CXFA_Node* pExcl = GetParent();
if (!pExcl || pExcl->GetElementType() != XFA_Element::ExclGroup)
return nullptr;
diff --git a/xfa/fxfa/parser/cxfa_node.h b/xfa/fxfa/parser/cxfa_node.h
index 8108eeccc4..dec324300d 100644
--- a/xfa/fxfa/parser/cxfa_node.h
+++ b/xfa/fxfa/parser/cxfa_node.h
@@ -263,7 +263,7 @@ class CXFA_Node : public CXFA_Object {
Optional<float> TryMaxWidth();
Optional<float> TryMaxHeight();
- CXFA_Node* GetExclGroup();
+ CXFA_Node* GetExclGroupIfExists();
int32_t ProcessEvent(CXFA_FFDocView* docView,
XFA_AttributeEnum iActivity,