diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /sw/inc | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'sw/inc')
38 files changed, 54 insertions, 54 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 907f6b2dc2bf..304321508208 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -187,7 +187,7 @@ class SwPostItMgr: public SfxListener public: SwPostItMgr(SwView* aDoc); - ~SwPostItMgr(); + virtual ~SwPostItMgr(); typedef std::list< SwSidebarItem* >::const_iterator const_iterator; const_iterator begin() const { return mvPostItFlds.begin(); } diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx index 63765c6e0ca3..6970dc74791f 100644 --- a/sw/inc/SwXMLSectionList.hxx +++ b/sw/inc/SwXMLSectionList.hxx @@ -56,7 +56,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - ~SvXMLSectionListContext ( void ); + virtual ~SvXMLSectionListContext ( void ); }; class SvXMLIgnoreSectionListContext : public SvXMLImportContext @@ -73,7 +73,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - ~SvXMLIgnoreSectionListContext ( void ); + virtual ~SvXMLIgnoreSectionListContext ( void ); }; #endif diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index edfed85948ac..01e42bdb551e 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -132,7 +132,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, public: SwAccessibleMap( SwViewShell *pSh ); - ~SwAccessibleMap(); + virtual ~SwAccessibleMap(); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetDocumentView(); diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 2e3308fd112d..97e29bee214b 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -74,7 +74,7 @@ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVER public: SwAuthorityFieldType(SwDoc* pDoc); - ~SwAuthorityFieldType(); + virtual ~SwAuthorityFieldType(); virtual SwFieldType* Copy() const SAL_OVERRIDE; @@ -155,7 +155,7 @@ public: SwAuthorityField(SwAuthorityFieldType* pType, const OUString& rFieldContents); SwAuthorityField(SwAuthorityFieldType* pType, sal_IntPtr nHandle); - ~SwAuthorityField(); + virtual ~SwAuthorityField(); OUString GetFieldText(ToxAuthorityField eField) const; diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 6ef9207bb3d6..8764a4b19849 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem public: SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL); - ~SwCondCollItem(); + virtual ~SwCondCollItem(); TYPEINFO_OVERRIDE(); diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index fef1f0171f31..2ecbe6c1453e 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -57,7 +57,7 @@ class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula public: SwTblBoxFormula( const OUString& rFormula ); - ~SwTblBoxFormula() {}; + virtual ~SwTblBoxFormula() {}; // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 6861248b5d9e..ce86081f7205 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType public: SwDBFieldType(SwDoc* pDocPtr, const OUString& rColumnName, const SwDBData& rDBData); - ~SwDBFieldType(); + virtual ~SwDBFieldType(); virtual OUString GetName() const SAL_OVERRIDE; virtual SwFieldType* Copy() const SAL_OVERRIDE; diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 797a2c4bec38..76b8f9647197 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType public: SwDDEFieldType( const OUString& rName, const OUString& rCmd, sal_uInt16 = sfx2::LINKUPDATE_ONCALL ); - ~SwDDEFieldType(); + virtual ~SwDDEFieldType(); OUString GetExpansion() const { return aExpansion; } void SetExpansion( const OUString& rStr ) { aExpansion = rStr; @@ -95,7 +95,7 @@ private: public: SwDDEField(SwDDEFieldType*); - ~SwDDEField(); + virtual ~SwDDEField(); /** Get parameter via types. Name cannot be changed. */ diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 35e4208982ba..aff1ba0a5abe 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -702,7 +702,7 @@ public: // Life cycle SwDoc(); - ~SwDoc(); + virtual ~SwDoc(); bool IsInDtor() const { return mbDtor; } diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 4662938eab93..a3c09abbd8e2 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -159,7 +159,7 @@ public: SwDocShell( SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED ); SwDocShell( const sal_uInt64 i_nSfxCreationFlags ); SwDocShell( SwDoc *pDoc, SfxObjectCreateMode eMode = SFX_CREATE_MODE_STANDARD ); - ~SwDocShell(); + virtual ~SwDocShell(); /// OLE 2.0-notification. DECL_LINK( Ole2ModifiedHdl, void * ); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 27a0c0461626..74c181e08a35 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -530,7 +530,7 @@ public: const OUString& rInitials, const OUString& rName, const DateTime& rDate); - ~SwPostItField(); + virtual ~SwPostItField(); virtual OUString Expand() const SAL_OVERRIDE; virtual SwField* Copy() const SAL_OVERRIDE; diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index b9774007b01e..d5760b23bebc 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -33,7 +33,7 @@ class SwDPage : public FmFormPage, public SdrObjUserCall public: SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage=sal_False); - ~SwDPage(); + virtual ~SwDPage(); // #i3694# // This GetOffset() method is not needed anymore, it even leads to errors. diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index 6d255dfe25c3..f06d5b5be386 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -29,7 +29,7 @@ class SwDrawDocument : public FmFormModel SwDoc* pDoc; public: SwDrawDocument( SwDoc* pDoc ); - ~SwDrawDocument(); + virtual ~SwDrawDocument(); const SwDoc& GetDoc() const { return *pDoc; } SwDoc& GetDoc() { return *pDoc; } diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index f410ca22c912..b27210c9b268 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem public: SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 ); SwFmtAnchor( const SwFmtAnchor &rCpy ); - ~SwFmtAnchor(); + virtual ~SwFmtAnchor(); SwFmtAnchor &operator=( const SwFmtAnchor& ); diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 4393f5cb8f78..4c7231248af8 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -92,7 +92,7 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem public: SwFmtCol(); SwFmtCol( const SwFmtCol& ); - ~SwFmtCol(); + virtual ~SwFmtCol(); //#i120133# sal_Int16 GetAdjustValue() const { return aWidthAdjustValue; } void SetAdjustValue( const sal_Int16& n ) { aWidthAdjustValue = n; } diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index db00d0755bad..7545bfdcbd0f 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem public: SwFmtCntnt( const SwStartNode* pStartNode = 0 ); SwFmtCntnt( const SwFmtCntnt &rCpy ); - ~SwFmtCntnt(); + virtual ~SwFmtCntnt(); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index b7f887d1dbbd..ce0574650fb4 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -39,7 +39,7 @@ public: SwFmtHeader( sal_Bool bOn = sal_False ); SwFmtHeader( SwFrmFmt *pHeaderFmt ); SwFmtHeader( const SwFmtHeader &rCpy ); - ~SwFmtHeader(); + virtual ~SwFmtHeader(); SwFmtHeader& operator=( const SwFmtHeader &rCpy ); TYPEINFO_OVERRIDE(); @@ -72,7 +72,7 @@ public: SwFmtFooter( sal_Bool bOn = sal_False ); SwFmtFooter( SwFrmFmt *pFooterFmt ); SwFmtFooter( const SwFmtFooter &rCpy ); - ~SwFmtFooter(); + virtual ~SwFmtFooter(); SwFmtFooter& operator=( const SwFmtFooter &rCpy ); TYPEINFO_OVERRIDE(); diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index c6a4198561a2..6ab4031b5346 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -33,7 +33,7 @@ class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem public: SwFmtLineNumber(); - ~SwFmtLineNumber(); + virtual ~SwFmtLineNumber(); TYPEINFO_OVERRIDE(); diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 3aa854538ff8..88924a0478da 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -53,7 +53,7 @@ public: SwFmtPageDesc( const SwPageDesc *pDesc = 0 ); SwFmtPageDesc( const SwFmtPageDesc &rCpy ); SwFmtPageDesc &operator=( const SwFmtPageDesc &rCpy ); - ~SwFmtPageDesc(); + virtual ~SwFmtPageDesc(); TYPEINFO_OVERRIDE(); diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index 650585734de8..88e7861008ec 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -38,7 +38,7 @@ class SwFmtRefMark : public SfxPoolItem public: SwFmtRefMark( const OUString& rTxt ); SwFmtRefMark( const SwFmtRefMark& rRefMark ); - ~SwFmtRefMark( ); + virtual ~SwFmtRefMark( ); /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index 565d2b168b47..454d5172ef6c 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -38,7 +38,7 @@ public: com::sun::star::text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); SwFmtWrapInfluenceOnObjPos( const SwFmtWrapInfluenceOnObjPos& _rCpy ); - ~SwFmtWrapInfluenceOnObjPos(); + virtual ~SwFmtWrapInfluenceOnObjPos(); SwFmtWrapInfluenceOnObjPos& operator=( const SwFmtWrapInfluenceOnObjPos& _rSource ); diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 9938de4151a6..acd6a5e90071 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -167,7 +167,7 @@ protected: public: TYPEINFO_OVERRIDE(); - ~SwFlyFrmFmt(); + virtual ~SwFlyFrmFmt(); /// Creates the views. virtual void MakeFrms() SAL_OVERRIDE; @@ -264,7 +264,7 @@ protected: public: TYPEINFO_OVERRIDE(); - ~SwDrawFrmFmt(); + virtual ~SwDrawFrmFmt(); /** DrawObjects are removed from the arrays at the layout. The DrawObjects are marked as deleted. */ diff --git a/sw/inc/globdoc.hxx b/sw/inc/globdoc.hxx index fa08d449d5b3..76174e362483 100644 --- a/sw/inc/globdoc.hxx +++ b/sw/inc/globdoc.hxx @@ -30,7 +30,7 @@ public: TYPEINFO_OVERRIDE(); SwGlobalDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED); - ~SwGlobalDocShell(); + virtual ~SwGlobalDocShell(); virtual void FillClass( SvGlobalName * pClassName, sal_uInt32 * pClipFormat, diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 649f11b0728b..af4064a4fa4b 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -167,7 +167,7 @@ class SwAttrSetChg: public SwMsgPoolItem public: SwAttrSetChg( const SwAttrSet& rTheSet, SwAttrSet& rSet ); SwAttrSetChg( const SwAttrSetChg& ); - ~SwAttrSetChg(); + virtual ~SwAttrSetChg(); /// What has changed const SwAttrSet* GetChgSet() const { return pChgSet; } diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 3c81e713905f..09c98bd666e4 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -60,7 +60,7 @@ class SwRevisionConfig : public utl::ConfigItem const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: SwRevisionConfig(); - ~SwRevisionConfig(); + virtual ~SwRevisionConfig(); virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; @@ -80,7 +80,7 @@ class SwCompareConfig : public utl::ConfigItem const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: SwCompareConfig(); - ~SwCompareConfig(); + virtual ~SwCompareConfig(); virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& ) SAL_OVERRIDE { }; @@ -106,7 +106,7 @@ class SwInsertConfig : public utl::ConfigItem const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: SwInsertConfig(sal_Bool bWeb); - ~SwInsertConfig(); + virtual ~SwInsertConfig(); virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; @@ -131,7 +131,7 @@ class SwTableConfig : public utl::ConfigItem const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: SwTableConfig(sal_Bool bWeb); - ~SwTableConfig(); + virtual ~SwTableConfig(); virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; @@ -159,7 +159,7 @@ class SwMiscConfig : public utl::ConfigItem const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: SwMiscConfig(); - ~SwMiscConfig(); + virtual ~SwMiscConfig(); virtual void Commit() SAL_OVERRIDE; virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) SAL_OVERRIDE; diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 37279c68af5d..752f86a65ab7 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -49,7 +49,7 @@ protected: SwGrfFmtColl *pGrColl, SwAttrSet* pAutoAttr = 0 ); public: - ~SwNoTxtNode(); + virtual ~SwNoTxtNode(); virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE; diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index f23a205d4473..0747a346bcee 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode public: const SwOLEObj& GetOLEObj() const { return aOLEObj; } SwOLEObj& GetOLEObj() { return aOLEObj; } - ~SwOLENode(); + virtual ~SwOLENode(); virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE; diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index e6f2203f8f87..ed8293b96483 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -247,7 +247,7 @@ public: SwPageDesc& operator=( const SwPageDesc& ); SwPageDesc( const SwPageDesc& ); - ~SwPageDesc(); + virtual ~SwPageDesc(); }; inline void SwPageDesc::SetFollow( const SwPageDesc* pNew ) diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 9b0e27e34240..21df9cdafbd5 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -265,7 +265,7 @@ class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint , mbSaveCntnt( bSaveCntnt ) {} - ~SwSectionFrmMoveAndDeleteHint() + virtual ~SwSectionFrmMoveAndDeleteHint() {} sal_Bool IsSaveCntnt() const @@ -300,7 +300,7 @@ protected: public: TYPEINFO_OVERRIDE(); // Already contained in base class client. - ~SwSectionFmt(); + virtual ~SwSectionFmt(); // Deletes all Frms in aDepend (Frms are recognized via PTR_CAST). virtual void DelFrms() SAL_OVERRIDE; diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 7b01d9aad4ad..bc6e18570e76 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -33,7 +33,7 @@ public: // After that SwTable is empty and has to be deleted. SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, sal_Bool bUpdate = sal_True ); - ~SwDDETable(); + virtual ~SwDDETable(); void ChangeContent(); sal_Bool NoDDETable(); diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 2a1bc0486d89..ba4198abb035 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -129,7 +129,7 @@ public: SfxObjectFactory* pWebFact, SfxObjectFactory* pGlobalFact ); - ~SwModule(); + virtual ~SwModule(); // Set view for internal use only. It is public only for technical reasons. inline void SetView(SwView* pVw) { pView = pVw; } diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index da3ddf32cf1a..ed2e0ac500bf 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -81,7 +81,7 @@ class SwXDrawPage : public SwXDrawPageBaseClass SwFmDrawPage* pDrawPage; public: SwXDrawPage(SwDoc* pDoc); - ~SwXDrawPage(); + virtual ~SwXDrawPage(); //XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 4e3d30b21f02..7f28bd08cd23 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -338,7 +338,7 @@ class SwXOLEListener : public cppu::WeakImplHelper1 SwFmt* GetFmt() const { return (SwFmt*)GetRegisteredIn(); } public: SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE); - ~SwXOLEListener(); + virtual ~SwXOLEListener(); TYPEINFO_OVERRIDE(); // ::com::sun::star::lang::XEventListener diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 55dcdd0676c7..355f17058d43 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -73,7 +73,7 @@ class SwXRedline : SwRangeRedline* pRedline; public: SwXRedline(SwRangeRedline& rRedline, SwDoc& rDoc); - ~SwXRedline(); + virtual ~SwXRedline(); TYPEINFO_OVERRIDE(); diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index bde8eba77cd0..deaf3aec1362 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -114,7 +114,7 @@ class SwXStyleFamily : public cppu::WeakImplHelper4 SwXStyle* _FindStyle(const OUString& rStyleName) const; public: SwXStyleFamily(SwDocShell* pDocShell, sal_uInt16 nFamily); - ~SwXStyleFamily(); + virtual ~SwXStyleFamily(); //XIndexAccess virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -204,7 +204,7 @@ public: SwDoc* pDoc, const OUString& rStyleName); - ~SwXStyle(); + virtual ~SwXStyle(); TYPEINFO_OVERRIDE(); @@ -282,7 +282,7 @@ public: const OUString& rStyleName) : SwXStyle(rPool, SFX_STYLE_FAMILY_FRAME, pDoc, rStyleName){} SwXFrameStyle( SwDoc *pDoc ); - ~SwXFrameStyle(); + virtual ~SwXFrameStyle(); virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE {SwXStyle::acquire();} virtual void SAL_CALL release( ) throw() SAL_OVERRIDE {SwXStyle::release();} @@ -311,7 +311,7 @@ public: SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rStyleName); SwXPageStyle(SwDocShell* pDocSh); - ~SwXPageStyle(); + virtual ~SwXPageStyle(); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 13e655fb4ec5..7552e1583cd6 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -458,7 +458,7 @@ class SwXCellRange : public cppu::WeakImplHelper7 public: SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwRangeDescriptor& rDesc); - ~SwXCellRange(); + virtual ~SwXCellRange(); TYPEINFO_OVERRIDE(); diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 4ceaef815bb6..f4d666221397 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -466,7 +466,7 @@ class SwXLinkTargetSupplier : public cppu::WeakImplHelper2 public: SwXLinkTargetSupplier(SwXTextDocument& rxDoc); - ~SwXLinkTargetSupplier(); + virtual ~SwXLinkTargetSupplier(); //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -505,7 +505,7 @@ public: const OUString& rLinkDisplayName, const OUString& sSuffix); SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, const OUString& rLinkDisplayName, const OUString& sSuffix); - ~SwXLinkNameAccessWrapper(); + virtual ~SwXLinkNameAccessWrapper(); //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -546,7 +546,7 @@ class SwXOutlineTarget : public cppu::WeakImplHelper2 public: SwXOutlineTarget(const OUString& rOutlineText); - ~SwXOutlineTarget(); + virtual ~SwXOutlineTarget(); //XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -576,7 +576,7 @@ class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable SwDoc* m_pDoc; public: SwXDocumentPropertyHelper(SwDoc& rDoc); - ~SwXDocumentPropertyHelper(); + virtual ~SwXDocumentPropertyHelper(); css::uno::Reference<css::uno::XInterface> GetDrawTable(short nWhich); void Invalidate(); diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index 0027f546088a..bd0e80213b3d 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -36,7 +36,7 @@ public: TYPEINFO_OVERRIDE(); SwWebDocShell(SfxObjectCreateMode eMode = SFX_CREATE_MODE_EMBEDDED); - ~SwWebDocShell(); + virtual ~SwWebDocShell(); virtual void FillClass( SvGlobalName * pClassName, sal_uInt32 * pClipFormat, |