diff options
Diffstat (limited to 'xfa/fxfa/include')
| -rw-r--r-- | xfa/fxfa/include/xfa_ffwidget.h | 5 | ||||
| -rw-r--r-- | xfa/fxfa/include/xfa_fontmgr.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/xfa/fxfa/include/xfa_ffwidget.h b/xfa/fxfa/include/xfa_ffwidget.h index 0c0ba75791..a6ab999485 100644 --- a/xfa/fxfa/include/xfa_ffwidget.h +++ b/xfa/fxfa/include/xfa_ffwidget.h @@ -29,13 +29,16 @@ enum XFA_WIDGETITEM { XFA_WIDGETITEM_NextSibling, XFA_WIDGETITEM_PrevSibling, }; + class CXFA_CalcData { public: CXFA_CalcData() : m_iRefCount(0) {} ~CXFA_CalcData() { m_Globals.RemoveAll(); } - CFX_PtrArray m_Globals; + + CFX_ArrayTemplate<CXFA_WidgetAcc*> m_Globals; int32_t m_iRefCount; }; + class CXFA_FFWidget : public CFX_PrivateData, public CXFA_ContentLayoutItem { public: CXFA_FFWidget(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc); diff --git a/xfa/fxfa/include/xfa_fontmgr.h b/xfa/fxfa/include/xfa_fontmgr.h index 8b3e20f5e3..c7358a4c2a 100644 --- a/xfa/fxfa/include/xfa_fontmgr.h +++ b/xfa/fxfa/include/xfa_fontmgr.h @@ -39,7 +39,7 @@ class CXFA_DefFontMgr { uint16_t wCodePage = 0xFFFF); protected: - CFX_PtrArray m_CacheFonts; + CFX_ArrayTemplate<IFX_Font*> m_CacheFonts; }; class CXFA_PDFFontMgr { |