Index: xfa/fxfa/app/xfa_fwltheme.cpp |
diff --git a/xfa/fxfa/app/xfa_fwltheme.cpp b/xfa/fxfa/app/xfa_fwltheme.cpp |
index d12678e51b3c60ed77e1d87e66a2c7dbc4aca101..1de302e995d798621a1cf9d5102766bc5161c770 100644 |
--- a/xfa/fxfa/app/xfa_fwltheme.cpp |
+++ b/xfa/fxfa/app/xfa_fwltheme.cpp |
@@ -75,10 +75,6 @@ CXFA_FWLTheme::CXFA_FWLTheme(CXFA_FFApp* pApp) |
CXFA_FWLTheme::~CXFA_FWLTheme() { |
m_pTextOut.reset(); |
- if (m_pCalendarFont) { |
- m_pCalendarFont->Release(); |
- m_pCalendarFont = nullptr; |
- } |
FWLTHEME_Release(); |
} |
@@ -193,7 +189,8 @@ float CXFA_FWLTheme::GetFontSize(CFWL_ThemePart* pThemePart) const { |
return FWLTHEME_CAPACITY_FontSize; |
} |
-CFGAS_GEFont* CXFA_FWLTheme::GetFont(CFWL_ThemePart* pThemePart) const { |
+CFX_RetainPtr<CFGAS_GEFont> CXFA_FWLTheme::GetFont( |
+ CFWL_ThemePart* pThemePart) const { |
if (CXFA_FFWidget* pWidget = XFA_ThemeGetOuterWidget(pThemePart->m_pWidget)) |
return pWidget->GetDataAcc()->GetFDEFont(); |
return GetTheme(pThemePart->m_pWidget)->GetFont(); |