Fix CPDFSDK_Widget::OnXFAAAction()

fpdfsdk/fsdk_baseform.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/include/fsdk_baseform.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 213 matching lines @@
         param.m_bKeyDown = data.bKeyDown;
         param.m_bModifier = data.bModifier;
         param.m_wsNewText = data.sValue;
         if (data.nSelEnd > data.nSelStart)
           param.m_wsNewText.Delete(data.nSelStart,
                                    data.nSelEnd - data.nSelStart);
         for (int i = 0; i < data.sChange.GetLength(); i++)
           param.m_wsNewText.Insert(data.nSelStart, data.sChange[i]);
         param.m_wsPrevText = data.sValue;
 
+        int32_t nRet = XFA_EVENTERROR_Error;
         if ((eEventType == XFA_EVENT_Click || eEventType == XFA_EVENT_Change) &&
-            GetFieldType() == FIELDTYPE_RADIOBUTTON) {
-          if (IXFA_Widget* hGroupWidget = GetGroupMixXFAWidget()) {

[jun_fang, 2016/03/21 06:21:46]

When users click a radio button, the clicking event is passed to its group
widget first. This gives its group widget a chance to handle the event. Later,
this event will be passed to the radio button itself.

[Wei Li, 2016/03/21 20:24:53]

Thank you for clarifying this!

-            CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hGroupWidget);
-            param.m_pTarget = pAcc;
-            pXFAWidgetHandler->ProcessEvent(pAcc, &param);

[jun_fang, 2016/03/21 06:21:46]

Pass the event to a group widget of radio button.

[Wei Li, 2016/03/21 20:24:53]

Acknowledged.

-          }
-
-          {
-            CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);

[jun_fang, 2016/03/21 06:21:46]

hWidget here is different with hGroupWidget. A group widget may have more than
one widget.

[Wei Li, 2016/03/21 20:24:53]

Acknowledged.

-            param.m_pTarget = pAcc;
-            int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);

[jun_fang, 2016/03/21 06:21:46]

Pass the event to radio button itself.

[Wei Li, 2016/03/21 20:24:53]

Acknowledged.

-            return nRet == XFA_EVENTERROR_Success;
-          }
+            GetFieldType() == FIELDTYPE_RADIOBUTTON &&
+            (IXFA_Widget* hGroupWidget = GetGroupMixXFAWidget())) {
+          param.m_pTarget = pXFAWidgetHandler->GetDataAcc(hGroupWidget);
+          nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);

[jun_fang, 2016/03/21 06:21:46]

pAcc should be updated to param.m_pTarget in your patch.

[Wei Li, 2016/03/21 20:24:53]

Done.

         } else {
-          CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
-          param.m_pTarget = pAcc;
-          int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
-          return nRet == XFA_EVENTERROR_Success;
+          param.m_pTarget = pXFAWidgetHandler->GetDataAcc(hWidget);
+          nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);

[jun_fang, 2016/03/21 06:21:46]

The same as above.

[Wei Li, 2016/03/21 20:24:53]

Done.

         }
 
         if (IXFA_DocView* pDocView = pDoc->GetXFADocView()) {
           pDocView->UpdateDocView();
         }
-      }
+        return nRet == XFA_EVENTERROR_Success;
     }
   }
 
   return FALSE;
 }
 
 void CPDFSDK_Widget::Synchronize(FX_BOOL bSynchronizeElse) {
   if (IXFA_Widget* hWidget = GetMixXFAWidget()) {
     if (IXFA_WidgetHandler* pXFAWidgetHandler = GetXFAWidgetHandler()) {
       CPDF_FormField* pFormField = GetFormField();
@@ skipping 2595 matching lines @@
       break;
     }
   }
 }
 
 CFX_FloatRect CBA_AnnotIterator::GetAnnotRect(const CPDFSDK_Annot* pAnnot) {
   CFX_FloatRect rcAnnot;
   pAnnot->GetPDFAnnot()->GetRect(rcAnnot);
   return rcAnnot;
 }