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 /editeng | |
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 'editeng')
-rw-r--r-- | editeng/source/accessibility/AccessibleHyperlink.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editattr.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editundo.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/edtspell.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eehtml.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eeobj.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eertfpar.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 6 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectImport.hxx | 12 | ||||
-rw-r--r-- | editeng/source/misc/unolingu.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outleeng.hxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outlundo.hxx | 2 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtexp.cxx | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx index e3cd8a3bb5ea..fe0ef70e91e4 100644 --- a/editeng/source/accessibility/AccessibleHyperlink.hxx +++ b/editeng/source/accessibility/AccessibleHyperlink.hxx @@ -48,7 +48,7 @@ namespace accessibility public: AccessibleHyperlink( SvxAccessibleTextAdapter& r, SvxFieldItem* p, sal_Int32 nP, sal_uInt16 nR, sal_Int32 nStt, sal_Int32 nEnd, const OUString& rD ); - ~AccessibleHyperlink(); + virtual ~AccessibleHyperlink(); // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index f958b9008a7a..36360635bf6f 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -355,7 +355,7 @@ class EditCharAttribField: public EditCharAttrib public: EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos ); EditCharAttribField( const EditCharAttribField& rAttr ); - ~EditCharAttribField(); + virtual ~EditCharAttribField(); bool operator == ( const EditCharAttribField& rAttr ) const; bool operator != ( const EditCharAttribField& rAttr ) const diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx index 9152b5d60b0e..c15d8c9491ee 100644 --- a/editeng/source/editeng/editundo.hxx +++ b/editeng/source/editeng/editundo.hxx @@ -86,7 +86,7 @@ private: public: EditUndoSplitPara(EditEngine* pEE, sal_Int32 nNode, sal_uInt16 nSepPos); - ~EditUndoSplitPara(); + virtual ~EditUndoSplitPara(); virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index 5e30f9986bdc..7f1f5c54027d 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -137,7 +137,7 @@ protected: public: EdtAutoCorrDoc(EditEngine* pE, ContentNode* pCurNode, sal_uInt16 nCrsr, sal_Unicode cIns); - ~EdtAutoCorrDoc(); + virtual ~EdtAutoCorrDoc(); virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) SAL_OVERRIDE; virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) SAL_OVERRIDE; diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx index 1ea44e8c73d3..e17fcc55715f 100644 --- a/editeng/source/editeng/eehtml.hxx +++ b/editeng/source/editeng/eehtml.hxx @@ -70,7 +70,7 @@ protected: public: EditHTMLParser(SvStream& rIn, const OUString& rBaseURL, SvKeyValueIterator* pHTTPHeaderAttrs); - ~EditHTMLParser(); + virtual ~EditHTMLParser(); SvParserState CallParser(EditEngine* pEE, const EditPaM& rPaM); diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx index bee1397c584c..236ee3821421 100644 --- a/editeng/source/editeng/eeobj.hxx +++ b/editeng/source/editeng/eeobj.hxx @@ -38,7 +38,7 @@ private: public: EditDataObject(); - ~EditDataObject(); + virtual ~EditDataObject(); SvMemoryStream& GetStream() { return maBinData; } SvMemoryStream& GetRTFStream() { return maRTFData; } diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx index ebca3e6aefeb..4a5c3ca152ea 100644 --- a/editeng/source/editeng/eertfpar.hxx +++ b/editeng/source/editeng/eertfpar.hxx @@ -97,7 +97,7 @@ protected: public: EditRTFParser(SvStream& rIn, EditSelection aCurSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine); - ~EditRTFParser(); + virtual ~EditRTFParser(); virtual SvParserState CallParser() SAL_OVERRIDE; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 16362d0afa6e..93be9b569074 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -193,7 +193,7 @@ private: public: IdleFormattter(); - ~IdleFormattter(); + virtual ~IdleFormattter(); void DoIdleFormat( EditView* pV ); void ForceTimeout(); @@ -267,7 +267,7 @@ protected: public: ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ); - ~ImpEditView(); + virtual ~ImpEditView(); EditView* GetEditViewPtr() { return pEditView; } @@ -687,7 +687,7 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; public: - ~ImpEditEngine(); + virtual ~ImpEditEngine(); inline EditUndoManager& GetUndoManager(); inline ::svl::IUndoManager* SetUndoManager(::svl::IUndoManager* pNew); diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index ac88beec89de..ccd74a1fffda 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -47,7 +47,7 @@ public: SvxAutoCorrect &rNewAutoCorrect, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rNewStorage); - ~SvXMLAutoCorrectImport ( void ) throw (); + virtual ~SvXMLAutoCorrectImport ( void ) throw (); }; class SvXMLWordListContext : public SvXMLImportContext @@ -64,7 +64,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - ~SvXMLWordListContext ( void ); + virtual ~SvXMLWordListContext ( void ); }; class SvXMLWordContext : public SvXMLImportContext @@ -77,7 +77,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - ~SvXMLWordContext ( void ); + virtual ~SvXMLWordContext ( void ); }; @@ -98,7 +98,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, SvStringsISortDtor & rNewList ); - ~SvXMLExceptionListImport ( void ) throw (); + virtual ~SvXMLExceptionListImport ( void ) throw (); }; class SvXMLExceptionListContext : public SvXMLImportContext @@ -115,7 +115,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - ~SvXMLExceptionListContext ( void ); + virtual ~SvXMLExceptionListContext ( void ); }; class SvXMLExceptionContext : public SvXMLImportContext @@ -128,7 +128,7 @@ public: const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); - ~SvXMLExceptionContext ( void ); + virtual ~SvXMLExceptionContext ( void ); }; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index f2c8c48ed6d3..0b5a5d085ad1 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -84,7 +84,7 @@ class ThesDummy_Impl : public: ThesDummy_Impl() : pLocaleSeq(0) {} - ~ThesDummy_Impl(); + virtual ~ThesDummy_Impl(); // XSupportedLocales virtual ::com::sun::star::uno::Sequence< diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index 6785881acb3f..dae743f8f7d5 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -36,7 +36,7 @@ protected: public: OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool ); - ~OutlinerEditEng(); + virtual ~OutlinerEditEng(); virtual void PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ) SAL_OVERRIDE; diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index ca622f03ef59..4d43adf744c9 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -119,7 +119,7 @@ class OLUndoExpand : public EditUndo void Restore( sal_Bool bUndo ); public: OLUndoExpand( Outliner* pOut, sal_uInt16 nId ); - ~OLUndoExpand(); + virtual ~OLUndoExpand(); virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; virtual void Repeat(); diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 94f91c6aec13..65debcbb2aad 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -352,7 +352,7 @@ public: const OUString& rFileName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler > & xHandler ); - ~SvxXMLTextExportComponent(); + virtual ~SvxXMLTextExportComponent(); // methods without content: virtual void _ExportAutoStyles() SAL_OVERRIDE; |