diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /editeng | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
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/editdoc.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editundo.hxx | 20 | ||||
-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/editeng/textconv.hxx | 2 | ||||
-rw-r--r-- | editeng/source/items/svxfont.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectExport.hxx | 4 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectImport.hxx | 12 | ||||
-rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/unolingu.cxx | 4 | ||||
-rw-r--r-- | editeng/source/outliner/outleeng.hxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outlundo.hxx | 2 | ||||
-rw-r--r-- | editeng/source/xml/editsource.hxx | 2 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtexp.cxx | 6 | ||||
-rw-r--r-- | editeng/source/xml/xmltxtimp.cxx | 4 |
20 files changed, 41 insertions, 41 deletions
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx index 6419e307b982..9dda555ab78a 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 ); - virtual ~AccessibleHyperlink(); + virtual ~AccessibleHyperlink() override; // XAccessibleAction virtual sal_Int32 SAL_CALL getAccessibleActionCount() throw (css::uno::RuntimeException, std::exception) override; diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx index 13bf5a297f66..3dffbe2197d7 100644 --- a/editeng/source/editeng/editattr.hxx +++ b/editeng/source/editeng/editattr.hxx @@ -369,7 +369,7 @@ class EditCharAttribField: public EditCharAttrib public: EditCharAttribField( const SvxFieldItem& rAttr, sal_uInt16 nPos ); EditCharAttribField( const EditCharAttribField& rAttr ); - virtual ~EditCharAttribField(); + virtual ~EditCharAttribField() override; bool operator == ( const EditCharAttribField& rAttr ) const; bool operator != ( const EditCharAttribField& rAttr ) const diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 063a54475195..cd3fd86a0c2b 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -825,7 +825,7 @@ class EditEngineItemPool : public SfxItemPool public: EditEngineItemPool( bool bPersistenRefCounts ); protected: - virtual ~EditEngineItemPool(); + virtual ~EditEngineItemPool() override; public: virtual SvStream& Store( SvStream& rStream ) const override; diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx index 5efcfd02d58d..1364b0c1db35 100644 --- a/editeng/source/editeng/editundo.hxx +++ b/editeng/source/editeng/editundo.hxx @@ -42,7 +42,7 @@ private: public: EditUndoDelContent(EditEngine* pEE, ContentNode* pNode, sal_Int32 nPortion); - virtual ~EditUndoDelContent(); + virtual ~EditUndoDelContent() override; virtual void Undo() override; virtual void Redo() override; @@ -71,7 +71,7 @@ public: EditUndoConnectParas(EditEngine* pEE, sal_Int32 nNode, sal_uInt16 nSepPos, const SfxItemSet& rLeftParaAttribs, const SfxItemSet& rRightParaAttribs, const SfxStyleSheet* pLeftStyle, const SfxStyleSheet* pRightStyle, bool bBackward); - virtual ~EditUndoConnectParas(); + virtual ~EditUndoConnectParas() override; virtual void Undo() override; virtual void Redo() override; @@ -88,7 +88,7 @@ private: public: EditUndoSplitPara(EditEngine* pEE, sal_Int32 nNode, sal_uInt16 nSepPos); - virtual ~EditUndoSplitPara(); + virtual ~EditUndoSplitPara() override; virtual void Undo() override; virtual void Redo() override; @@ -139,7 +139,7 @@ private: public: EditUndoInsertFeature(EditEngine* pEE, const EPaM& rEPaM, const SfxPoolItem& rFeature); - virtual ~EditUndoInsertFeature(); + virtual ~EditUndoInsertFeature() override; virtual void Undo() override; virtual void Redo() override; @@ -156,7 +156,7 @@ private: public: EditUndoMoveParagraphs(EditEngine* pEE, const Range& rParas, sal_Int32 nDest); - virtual ~EditUndoMoveParagraphs(); + virtual ~EditUndoMoveParagraphs() override; virtual void Undo() override; virtual void Redo() override; @@ -180,7 +180,7 @@ public: const OUString& rPrevName, SfxStyleFamily ePrevFamily, const OUString& rNewName, SfxStyleFamily eNewFamily, const SfxItemSet& rPrevParaAttribs); - virtual ~EditUndoSetStyleSheet(); + virtual ~EditUndoSetStyleSheet() override; virtual void Undo() override; virtual void Redo() override; @@ -198,7 +198,7 @@ private: public: EditUndoSetParaAttribs(EditEngine* pEE, sal_Int32 nPara, const SfxItemSet& rPrevItems, const SfxItemSet& rNewItems); - virtual ~EditUndoSetParaAttribs(); + virtual ~EditUndoSetParaAttribs() override; virtual void Undo() override; virtual void Redo() override; @@ -226,7 +226,7 @@ private: public: EditUndoSetAttribs(EditEngine* pEE, const ESelection& rESel, const SfxItemSet& rNewItems); - virtual ~EditUndoSetAttribs(); + virtual ~EditUndoSetAttribs() override; SfxItemSet& GetNewAttribs() { return aNewAttribs; } @@ -256,7 +256,7 @@ private: public: EditUndoTransliteration(EditEngine* pEE, const ESelection& rESel, sal_Int32 nMode); - virtual ~EditUndoTransliteration(); + virtual ~EditUndoTransliteration() override; void SetText( const OUString& rText ) { aText = rText; } void SetText( EditTextObject* pObj ) { pTxtObj = pObj; } @@ -276,7 +276,7 @@ private: public: EditUndoMarkSelection(EditEngine* pEE, const ESelection& rSel); - virtual ~EditUndoMarkSelection(); + virtual ~EditUndoMarkSelection() override; virtual void Undo() override; virtual void Redo() override; diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx index baf7b7721e91..1a2bca363b84 100644 --- a/editeng/source/editeng/edtspell.hxx +++ b/editeng/source/editeng/edtspell.hxx @@ -129,7 +129,7 @@ protected: public: EdtAutoCorrDoc(EditEngine* pE, ContentNode* pCurNode, sal_Int32 nCrsr, sal_Unicode cIns); - virtual ~EdtAutoCorrDoc(); + virtual ~EdtAutoCorrDoc() override; virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd ) override; virtual bool Insert( sal_Int32 nPos, const OUString& rTxt ) override; diff --git a/editeng/source/editeng/eehtml.hxx b/editeng/source/editeng/eehtml.hxx index 66af55ee2a32..b952a66ff2a4 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); - virtual ~EditHTMLParser(); + virtual ~EditHTMLParser() override; SvParserState CallParser(EditEngine* pEE, const EditPaM& rPaM); diff --git a/editeng/source/editeng/eeobj.hxx b/editeng/source/editeng/eeobj.hxx index 728d791aad85..59bc1e9c77de 100644 --- a/editeng/source/editeng/eeobj.hxx +++ b/editeng/source/editeng/eeobj.hxx @@ -38,7 +38,7 @@ private: public: EditDataObject(); - virtual ~EditDataObject(); + virtual ~EditDataObject() override; SvMemoryStream& GetStream() { return maBinData; } SvMemoryStream& GetRTFStream() { return maRTFData; } diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx index 86194a097c5d..250000a8b7cc 100644 --- a/editeng/source/editeng/eertfpar.hxx +++ b/editeng/source/editeng/eertfpar.hxx @@ -59,7 +59,7 @@ protected: public: EditRTFParser(SvStream& rIn, EditSelection aCurSel, SfxItemPool& rAttrPool, EditEngine* pEditEngine); - virtual ~EditRTFParser(); + virtual ~EditRTFParser() override; virtual SvParserState CallParser() override; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 69bac8d1d099..612fe41f7236 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -197,7 +197,7 @@ private: public: IdleFormattter(); - virtual ~IdleFormattter(); + virtual ~IdleFormattter() override; void DoIdleFormat( EditView* pV ); void ForceTimeout(); @@ -273,7 +273,7 @@ protected: public: ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindow ); - virtual ~ImpEditView(); + virtual ~ImpEditView() override; EditView* GetEditViewPtr() { return pEditView; } @@ -700,7 +700,7 @@ protected: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; public: - virtual ~ImpEditEngine(); + virtual ~ImpEditEngine() override; ImpEditEngine(const ImpEditEngine&) = delete; ImpEditEngine& operator=(const ImpEditEngine&) = delete; diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx index e7209fc983e0..301fcf746f09 100644 --- a/editeng/source/editeng/textconv.hxx +++ b/editeng/source/editeng/textconv.hxx @@ -102,7 +102,7 @@ public: bool bIsInteractive, bool bIsStart, EditView* pView ); - virtual ~TextConvWrapper(); + virtual ~TextConvWrapper() override; void Convert(); }; diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx index 52681d11b106..262a5c7e8073 100644 --- a/editeng/source/items/svxfont.cxx +++ b/editeng/source/items/svxfont.cxx @@ -588,7 +588,7 @@ public: nKern( _nKrn ) { } - virtual ~SvxDoGetCapitalSize() {} + virtual ~SvxDoGetCapitalSize() override {} virtual void Do( const OUString &rTxt, const sal_Int32 nIdx, const sal_Int32 nLen, const bool bUpper ) override; diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx index 73df5592a5b3..3b3de1dc0622 100644 --- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx @@ -36,7 +36,7 @@ public: const OUString &rFileName, css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); - virtual ~SvXMLAutoCorrectExport() {} + virtual ~SvXMLAutoCorrectExport() override {} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID) override; void ExportAutoStyles_() override {} void ExportMasterStyles_ () override {} @@ -56,7 +56,7 @@ public: const OUString &rFileName, css::uno::Reference< css::xml::sax::XDocumentHandler> &rHandler); - virtual ~SvXMLExceptionListExport() {} + virtual ~SvXMLExceptionListExport() override {} sal_uInt32 exportDoc(enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID) override; void ExportAutoStyles_() override {} void ExportMasterStyles_ () override {} diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.hxx b/editeng/source/misc/SvXMLAutoCorrectImport.hxx index b69e42cb2490..c27219f70b7b 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.hxx @@ -44,7 +44,7 @@ public: SvxAutoCorrect &rNewAutoCorrect, const css::uno::Reference < css::embed::XStorage >& rNewStorage); - virtual ~SvXMLAutoCorrectImport() throw (); + virtual ~SvXMLAutoCorrectImport() throw () override; }; class SvXMLWordListContext : public SvXMLImportContext @@ -59,7 +59,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual ~SvXMLWordListContext(); + virtual ~SvXMLWordListContext() override; }; class SvXMLWordContext : public SvXMLImportContext @@ -70,7 +70,7 @@ public: SvXMLWordContext ( SvXMLAutoCorrectImport& rImport, sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); - virtual ~SvXMLWordContext(); + virtual ~SvXMLWordContext() override; }; @@ -89,7 +89,7 @@ public: const css::uno::Reference< css::uno::XComponentContext > & xContext, SvStringsISortDtor & rNewList ); - virtual ~SvXMLExceptionListImport() throw (); + virtual ~SvXMLExceptionListImport() throw () override; }; class SvXMLExceptionListContext : public SvXMLImportContext @@ -104,7 +104,7 @@ public: const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - virtual ~SvXMLExceptionListContext(); + virtual ~SvXMLExceptionListContext() override; }; class SvXMLExceptionContext : public SvXMLImportContext @@ -115,7 +115,7 @@ public: SvXMLExceptionContext ( SvXMLExceptionListImport& rImport, sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); - virtual ~SvXMLExceptionContext(); + virtual ~SvXMLExceptionContext() override; }; diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx index 66068e251be2..9913a0dd9294 100644 --- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx +++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.hxx @@ -36,7 +36,7 @@ class SvXMLAutoCorrectTokenHandler : public { public: explicit SvXMLAutoCorrectTokenHandler(); - virtual ~SvXMLAutoCorrectTokenHandler(); + virtual ~SvXMLAutoCorrectTokenHandler() override; //XFastTokenHandler virtual sal_Int32 SAL_CALL getTokenFromUTF8( const css::uno::Sequence< sal_Int8 >& Identifier ) diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index a9d28011fb69..e8af80883467 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -84,7 +84,7 @@ class ThesDummy_Impl : public: ThesDummy_Impl() : pLocaleSeq(nullptr) {} - virtual ~ThesDummy_Impl(); + virtual ~ThesDummy_Impl() override; // XSupportedLocales virtual css::uno::Sequence< css::lang::Locale > SAL_CALL @@ -435,7 +435,7 @@ class LinguMgrExitLstnr : public cppu::WeakImplHelper<XEventListener> public: LinguMgrExitLstnr(); - virtual ~LinguMgrExitLstnr(); + virtual ~LinguMgrExitLstnr() override; // lang::XEventListener virtual void SAL_CALL disposing(const EventObject& rSource) diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx index f165e3220d86..daaa6696c367 100644 --- a/editeng/source/outliner/outleeng.hxx +++ b/editeng/source/outliner/outleeng.hxx @@ -36,7 +36,7 @@ protected: public: OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool ); - virtual ~OutlinerEditEng(); + virtual ~OutlinerEditEng() override; virtual void PaintingFirstLine( sal_Int32 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev ) override; diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx index adc15549593b..f1d5fc9696d3 100644 --- a/editeng/source/outliner/outlundo.hxx +++ b/editeng/source/outliner/outlundo.hxx @@ -109,7 +109,7 @@ class OLUndoExpand : public EditUndo void Restore( bool bUndo ); public: OLUndoExpand( Outliner* pOut, sal_uInt16 nId ); - virtual ~OLUndoExpand(); + virtual ~OLUndoExpand() override; virtual void Undo() override; virtual void Redo() override; diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx index a22728f34e4b..335427808690 100644 --- a/editeng/source/xml/editsource.hxx +++ b/editeng/source/xml/editsource.hxx @@ -29,7 +29,7 @@ class SvxEditEngineSource : public SvxEditSource { public: explicit SvxEditEngineSource( EditEngine* pEditEngine ); - virtual ~SvxEditEngineSource(); + virtual ~SvxEditEngineSource() override; virtual SvxEditSource* Clone() const override; virtual SvxTextForwarder* GetTextForwarder() override; diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx index 348aa2e73eb7..cb4f208ca649 100644 --- a/editeng/source/xml/xmltxtexp.cxx +++ b/editeng/source/xml/xmltxtexp.cxx @@ -65,7 +65,7 @@ private: EditEngine* mpEditEngine; SvxTextForwarder* mpTextForwarder; - virtual ~SvxEditEngineSourceImpl(); + virtual ~SvxEditEngineSourceImpl() override; public: explicit SvxEditEngineSourceImpl( EditEngine* pEditEngine ); @@ -130,7 +130,7 @@ class SvxSimpleUnoModel : public cppu::WeakAggImplHelper4< { public: SvxSimpleUnoModel(); - virtual ~SvxSimpleUnoModel(); + virtual ~SvxSimpleUnoModel() override; // XMultiServiceFactory @@ -301,7 +301,7 @@ public: const OUString& rFileName, const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHandler ); - virtual ~SvxXMLTextExportComponent(); + virtual ~SvxXMLTextExportComponent() override; // methods without content: virtual void ExportAutoStyles_() override; diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx index 8cedcbc3a8e9..8a09a5732121 100644 --- a/editeng/source/xml/xmltxtimp.cxx +++ b/editeng/source/xml/xmltxtimp.cxx @@ -56,7 +56,7 @@ class SvxXMLTextImportContext : public SvXMLImportContext { public: SvxXMLTextImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, const uno::Reference< XText >& xText ); - virtual ~SvxXMLTextImportContext(); + virtual ~SvxXMLTextImportContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override; @@ -108,7 +108,7 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rContext, const uno::Reference< XText > & rText ); - virtual ~SvxXMLXTextImportComponent() throw (); + virtual ~SvxXMLXTextImportComponent() throw () override; private: const uno::Reference< XText > mxText; |