XFA: more underlying type changes to match master

fpdfsdk/src/fsdk_annothandler.cpp

Index: fpdfsdk/src/fsdk_annothandler.cpp
diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp
index 2965d3290f2d95b638f49a046c2a003fb42ddc15..5edd88a8e254c0fbd90e0b01effb2b1e3f621e06 100644
--- a/fpdfsdk/src/fsdk_annothandler.cpp
+++ b/fpdfsdk/src/fsdk_annothandler.cpp
@@ -142,10 +142,10 @@ void CPDFSDK_AnnotHandlerMgr::Annot_OnDraw(CPDFSDK_PageView* pPageView,
   if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot)) {
     pAnnotHandler->OnDraw(pPageView, pAnnot, pDevice, pUser2Device, dwFlags);
   } else {
-    if (!pAnnot->IsXFAField()) {
-      static_cast<CPDFSDK_BAAnnot*>(pAnnot)
-          ->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
-    }
+    if (pAnnot->IsXFAField())
+      return;
+    static_cast<CPDFSDK_BAAnnot*>(pAnnot)
+        ->DrawAppearance(pDevice, pUser2Device, CPDF_Annot::Normal, nullptr);
   }
 }