Index: fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp |
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp |
index 106d997e440493c95147a8a2385398256750c13b..a44172e191f51e1c6208d6ad04b037e878e0b001 100644 |
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp |
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp |
@@ -538,7 +538,8 @@ void CPDFXFA_DocEnvironment::SetFocusWidget(CXFA_FFDoc* hDoc, |
return; |
if (!hWidget) { |
- m_pDocument->GetSDKDoc()->SetFocusAnnot(nullptr); |
+ CPDFSDK_Annot::ObservedPtr pNull; |
+ m_pDocument->GetSDKDoc()->SetFocusAnnot(&pNull); |
return; |
} |
@@ -548,9 +549,9 @@ void CPDFXFA_DocEnvironment::SetFocusWidget(CXFA_FFDoc* hDoc, |
if (!pPageView) |
continue; |
- CPDFSDK_Annot* pAnnot = pPageView->GetAnnotByXFAWidget(hWidget); |
+ CPDFSDK_Annot::ObservedPtr pAnnot(pPageView->GetAnnotByXFAWidget(hWidget)); |
if (pAnnot) { |
- m_pDocument->GetSDKDoc()->SetFocusAnnot(pAnnot); |
+ m_pDocument->GetSDKDoc()->SetFocusAnnot(&pAnnot); |
break; |
} |
} |