From 568aff520b4ca33d851317a4ea88807b4fd2da40 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Jun 2015 14:58:28 -0700 Subject: Fix -Wnon-virtual-dtor warnings on the XFA branch. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1183483003. --- xfa/src/fxfa/src/app/xfa_checksum.h | 2 +- xfa/src/fxfa/src/app/xfa_ffdocview.h | 4 ++-- xfa/src/fxfa/src/app/xfa_fwladapter.h | 1 + xfa/src/fxfa/src/app/xfa_textlayout.h | 1 + xfa/src/fxfa/src/common/xfa_docdata.h | 2 ++ xfa/src/fxfa/src/common/xfa_doclayout.h | 1 + xfa/src/fxfa/src/common/xfa_document.h | 2 ++ xfa/src/fxfa/src/common/xfa_localemgr.h | 4 +++- xfa/src/fxfa/src/common/xfa_parser.h | 2 ++ xfa/src/fxfa/src/common/xfa_script.h | 3 ++- 10 files changed, 17 insertions(+), 5 deletions(-) (limited to 'xfa/src/fxfa') diff --git a/xfa/src/fxfa/src/app/xfa_checksum.h b/xfa/src/fxfa/src/app/xfa_checksum.h index 4ffe670979..62e439fe1b 100644 --- a/xfa/src/fxfa/src/app/xfa_checksum.h +++ b/xfa/src/fxfa/src/app/xfa_checksum.h @@ -40,7 +40,7 @@ class CXFA_ChecksumContext : public IXFA_ChecksumContext { public: CXFA_ChecksumContext(); - ~CXFA_ChecksumContext(); + virtual ~CXFA_ChecksumContext(); virtual void Release() { delete this; diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h index 557a39f3f6..6037716d8c 100644 --- a/xfa/src/fxfa/src/app/xfa_ffdocview.h +++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h @@ -121,7 +121,7 @@ class CXFA_FFDocWidgetIterator : public IXFA_WidgetIterator { public: CXFA_FFDocWidgetIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot); - ~CXFA_FFDocWidgetIterator(); + virtual ~CXFA_FFDocWidgetIterator(); virtual void Release() { @@ -144,7 +144,7 @@ class CXFA_WidgetAccIterator : public IXFA_WidgetAccIterator { public: CXFA_WidgetAccIterator(CXFA_FFDocView* pDocView, CXFA_Node* pTravelRoot); - ~CXFA_WidgetAccIterator(); + virtual ~CXFA_WidgetAccIterator(); virtual void Release() { delete this; diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.h b/xfa/src/fxfa/src/app/xfa_fwladapter.h index 62975ff0da..8c472d46db 100644 --- a/xfa/src/fxfa/src/app/xfa_fwladapter.h +++ b/xfa/src/fxfa/src/app/xfa_fwladapter.h @@ -15,6 +15,7 @@ public: class IXFA_FWLEventHandler { public: + virtual ~IXFA_FWLEventHandler() {} virtual FX_BOOL GetPopupPos(IFWL_Widget *pWidget, FX_FLOAT fMinPopup, FX_FLOAT fMaxPopup, const CFX_RectF &rtAnchor, CFX_RectF& rtPopup) { diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.h b/xfa/src/fxfa/src/app/xfa_textlayout.h index bb8b4b528d..2e01066680 100644 --- a/xfa/src/fxfa/src/app/xfa_textlayout.h +++ b/xfa/src/fxfa/src/app/xfa_textlayout.h @@ -11,6 +11,7 @@ class CXFA_TextTabstopsContext; class IXFA_TextProvider { public: + virtual ~IXFA_TextProvider() {} virtual CXFA_Node* GetTextNode(FX_BOOL &bRichText) = 0; virtual CXFA_Para GetParaNode() = 0; virtual CXFA_Font GetFontNode() = 0; diff --git a/xfa/src/fxfa/src/common/xfa_docdata.h b/xfa/src/fxfa/src/common/xfa_docdata.h index 7befa23d7f..b709fce016 100644 --- a/xfa/src/fxfa/src/common/xfa_docdata.h +++ b/xfa/src/fxfa/src/common/xfa_docdata.h @@ -13,6 +13,7 @@ class IXFA_PacketExport { public: static IXFA_PacketExport* Create(CXFA_Document *pDocument, XFA_DATAFORMAT eFormat = XFA_DATAFORMAT_XDP); + virtual ~IXFA_PacketExport() {} virtual void Release() = 0; virtual FX_BOOL Export(IFX_FileWrite *pWrite) = 0; virtual FX_BOOL Export(IFX_FileWrite *pWrite, CXFA_Node *pNode, FX_DWORD dwFlag = 0, const FX_CHAR* pChecksum = NULL) = 0; @@ -21,6 +22,7 @@ class IXFA_PacketImport { public: static IXFA_PacketImport* Create(CXFA_Document *pDstDoc); + virtual ~IXFA_PacketImport() {} virtual void Release() = 0; virtual FX_BOOL ImportData(IFX_FileRead* pDataDocument) = 0; }; diff --git a/xfa/src/fxfa/src/common/xfa_doclayout.h b/xfa/src/fxfa/src/common/xfa_doclayout.h index d360faa62c..78c58a1edf 100644 --- a/xfa/src/fxfa/src/common/xfa_doclayout.h +++ b/xfa/src/fxfa/src/common/xfa_doclayout.h @@ -95,6 +95,7 @@ public: class IXFA_DocLayout { public: + virtual ~IXFA_DocLayout() {} virtual CXFA_Document* GetDocument() const = 0; virtual int32_t StartLayout(FX_BOOL bForceRestart = FALSE) = 0; virtual int32_t DoLayout(IFX_Pause *pPause = NULL) = 0; diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h index 20b8e1a020..47cf98e717 100644 --- a/xfa/src/fxfa/src/common/xfa_document.h +++ b/xfa/src/fxfa/src/common/xfa_document.h @@ -64,6 +64,7 @@ enum XFA_LAYOUTRESULT { class IXFA_Notify { public: + virtual ~IXFA_Notify() {} virtual void OnPageEvent(IXFA_LayoutPage *pSender, XFA_PAGEEVENT eEvent, void* pParam = NULL) = 0; virtual void OnNodeEvent(CXFA_Node *pSender, XFA_NODEEVENT eEvent, void* pParam = NULL, void* pParam2 = NULL, void* pParam3 = NULL, void* pParam4 = NULL) = 0; @@ -93,6 +94,7 @@ public: class IXFA_ObjFactory { public: + virtual ~IXFA_ObjFactory() {} virtual CXFA_Node* CreateNode(FX_DWORD dwPacket, XFA_ELEMENT eElement) = 0; virtual CXFA_Node* CreateNode(XFA_LPCPACKETINFO pPacket, XFA_ELEMENT eElement) = 0; }; diff --git a/xfa/src/fxfa/src/common/xfa_localemgr.h b/xfa/src/fxfa/src/common/xfa_localemgr.h index 14981ca418..19c7b96172 100644 --- a/xfa/src/fxfa/src/common/xfa_localemgr.h +++ b/xfa/src/fxfa/src/common/xfa_localemgr.h @@ -52,6 +52,8 @@ public: static IXFA_TimeZoneProvider* Get(); static void Destroy(); + virtual ~IXFA_TimeZoneProvider() {} + virtual void SetTimeZone(FX_TIMEZONE& tz) = 0; virtual void GetTimeZone(FX_TIMEZONE& tz) = 0; @@ -60,7 +62,7 @@ class CXFA_TimeZoneProvider : public IXFA_TimeZoneProvider { public: CXFA_TimeZoneProvider(); - ~CXFA_TimeZoneProvider(); + virtual ~CXFA_TimeZoneProvider(); virtual void SetTimeZone(FX_TIMEZONE& tz); virtual void GetTimeZone(FX_TIMEZONE& tz); private: diff --git a/xfa/src/fxfa/src/common/xfa_parser.h b/xfa/src/fxfa/src/common/xfa_parser.h index b534acd03c..08a8b3413d 100644 --- a/xfa/src/fxfa/src/common/xfa_parser.h +++ b/xfa/src/fxfa/src/common/xfa_parser.h @@ -11,6 +11,7 @@ class IXFA_Parser { public: static IXFA_Parser* Create(IXFA_ObjFactory *pFactory, FX_BOOL bDocumentParser = FALSE); + virtual ~IXFA_Parser() {} virtual void Release() = 0; virtual int32_t StartParse(IFX_FileRead *pStream, XFA_XDPPACKET ePacketID = XFA_XDPPACKET_XDP) = 0; virtual int32_t DoParse(IFX_Pause *pPause = NULL) = 0; @@ -32,6 +33,7 @@ class IXFA_DataLoaderOptionsProvider { public: static IXFA_DataLoaderOptionsProvider* Create(CXFA_Node* pConfigurationDOM); + virtual ~IXFA_DataLoaderOptionsProvider() {} virtual void Release() = 0; }; #endif diff --git a/xfa/src/fxfa/src/common/xfa_script.h b/xfa/src/fxfa/src/common/xfa_script.h index c7f18071ac..fd9cdc44ac 100644 --- a/xfa/src/fxfa/src/common/xfa_script.h +++ b/xfa/src/fxfa/src/common/xfa_script.h @@ -67,8 +67,8 @@ typedef struct _XFA_RESOLVENODE_RS { return hValueArray.GetSize(); } CXFA_ObjArray nodes; - XFA_LPCSCRIPTATTRIBUTEINFO pScriptAttribute; XFA_RESOVENODE_RSTYPE dwFlags; + XFA_LPCSCRIPTATTRIBUTEINFO pScriptAttribute; } XFA_RESOLVENODE_RS, * XFA_LPRESOLVENODE_RS; typedef struct _XFA_JSBUILTININFO { uint32_t uUnicodeHash; @@ -79,6 +79,7 @@ XFA_LPCJSBUILTININFO XFA_GetJSBuiltinByHash(uint32_t uHashCode); class IXFA_ScriptContext { public: + virtual ~IXFA_ScriptContext() {} virtual void Release() = 0; virtual void Initialize(FXJSE_HRUNTIME hRuntime) = 0; -- cgit v1.2.3