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 /sw/inc | |
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 'sw/inc')
117 files changed, 204 insertions, 204 deletions
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 9d556ed7899d..8d41b587871c 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -36,7 +36,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin SwPostItBits aBits, SwSidebarItem& rSidebarItem, SwFormatField* aField ); - virtual ~SwAnnotationWin(); + virtual ~SwAnnotationWin() override; virtual void dispose() override; virtual void UpdateData() override; diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx index 941c33c852f3..bad990987955 100644 --- a/sw/inc/PageColumnPopup.hxx +++ b/sw/inc/PageColumnPopup.hxx @@ -30,7 +30,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); PageColumnPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~PageColumnPopup(); + virtual ~PageColumnPopup() override; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; }; diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx index 7726104a562f..6fe37648873c 100644 --- a/sw/inc/PageOrientationPopup.hxx +++ b/sw/inc/PageOrientationPopup.hxx @@ -30,7 +30,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); PageOrientationPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~PageOrientationPopup(); + virtual ~PageOrientationPopup() override; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; }; diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx index 091d853144d7..ab9cd80f1c7b 100644 --- a/sw/inc/PageSizePopup.hxx +++ b/sw/inc/PageSizePopup.hxx @@ -30,7 +30,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); PageSizePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx); - virtual ~PageSizePopup(); + virtual ~PageSizePopup() override; virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override; }; diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 56ff91cf3e44..e6f5460591e6 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -193,7 +193,7 @@ class SwPostItMgr: public SfxListener public: SwPostItMgr(SwView* aDoc); - virtual ~SwPostItMgr(); + virtual ~SwPostItMgr() override; typedef std::list< SwSidebarItem* >::const_iterator const_iterator; const_iterator begin() const { return mvPostItFields.begin(); } diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 733a20c70517..e2c76821f935 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -65,7 +65,7 @@ class SwSidebarWin : public vcl::Window SwPostItMgr& aMgr, SwPostItBits aBits, SwSidebarItem& rSidebarItem ); - virtual ~SwSidebarWin(); + virtual ~SwSidebarWin() override; virtual void dispose() override; void SetSize( const Size& rNewSize ); diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx index f597529f28a6..e333c137f85e 100644 --- a/sw/inc/SwNodeNum.hxx +++ b/sw/inc/SwNodeNum.hxx @@ -33,7 +33,7 @@ public: explicit SwNodeNum( SwTextNode* pTextNode ); explicit SwNodeNum( SwNumRule* pNumRule ); - virtual ~SwNodeNum(); + virtual ~SwNodeNum() override; SwNumRule* GetNumRule() const { return mpNumRule;} void ChangeNumRule( SwNumRule& rNumRule ); diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index a26c1708045e..0d6b558a7240 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -29,7 +29,7 @@ private: static SwSmartTagMgr* mpTheSwSmartTagMgr; SwSmartTagMgr( const OUString& rModuleName ); - virtual ~SwSmartTagMgr(); + virtual ~SwSmartTagMgr() override; public: static SwSmartTagMgr& Get(); diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx index 66ad76e992d4..a2c7589dd18c 100644 --- a/sw/inc/SwUndoField.hxx +++ b/sw/inc/SwUndoField.hxx @@ -38,7 +38,7 @@ protected: public: SwUndoField(const SwPosition & rPos, SwUndoId nId = UNDO_FIELD ); - virtual ~SwUndoField(); + virtual ~SwUndoField() override; }; class SwUndoFieldFromDoc : public SwUndoField @@ -54,7 +54,7 @@ public: const SwField & aNewField, SwMsgPoolItem * pHint, bool bUpdate); - virtual ~SwUndoFieldFromDoc(); + virtual ~SwUndoFieldFromDoc() override; virtual void UndoImpl( ::sw::UndoRedoContext & ) override; virtual void RedoImpl( ::sw::UndoRedoContext & ) override; @@ -73,7 +73,7 @@ public: const css::uno::Any & rOldVal, const css::uno::Any & rNewVal, sal_uInt16 nWhich); - virtual ~SwUndoFieldFromAPI(); + virtual ~SwUndoFieldFromAPI() override; virtual void UndoImpl( ::sw::UndoRedoContext & ) override; virtual void RedoImpl( ::sw::UndoRedoContext & ) override; diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx index 4eec7723e7de..666bbe832d8d 100644 --- a/sw/inc/SwXMLSectionList.hxx +++ b/sw/inc/SwXMLSectionList.hxx @@ -38,7 +38,7 @@ public: std::vector<OUString*> &rNewSectionList ); virtual ~SwXMLSectionList ( ) - throw(); + throw() override; }; class SvXMLSectionListContext : public SvXMLImportContext @@ -53,7 +53,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList ) override; - virtual ~SvXMLSectionListContext(); + virtual ~SvXMLSectionListContext() override; }; #endif diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 38eba83c4213..e09129a34482 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -127,7 +127,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, public: SwAccessibleMap( SwViewShell *pSh ); - virtual ~SwAccessibleMap(); + virtual ~SwAccessibleMap() override; css::uno::Reference<css::accessibility::XAccessible> GetDocumentView(); diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 5336f2a9d36d..1e6388852c39 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -123,7 +123,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject public: SwAnchoredDrawObject(); - virtual ~SwAnchoredDrawObject(); + virtual ~SwAnchoredDrawObject() override; // declaration of pure virtual methods of base class <SwAnchoredObject> virtual void MakeObjPos() override; diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 6cf7a2093d3c..fb345dba02b3 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -76,7 +76,7 @@ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override public: SwAuthorityFieldType(SwDoc* pDoc); - virtual ~SwAuthorityFieldType(); + virtual ~SwAuthorityFieldType() override; virtual SwFieldType* Copy() const override; @@ -160,7 +160,7 @@ public: SwAuthorityField(SwAuthorityFieldType* pType, const OUString& rFieldContents); SwAuthorityField(SwAuthorityFieldType* pType, sal_IntPtr nHandle); - virtual ~SwAuthorityField(); + virtual ~SwAuthorityField() override; OUString GetFieldText(ToxAuthorityField eField) const; diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 8890f6b3d203..71a86bb3935b 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -66,7 +66,7 @@ namespace sw struct SW_DLLPUBLIC LegacyModifyHint final: SfxHint { LegacyModifyHint(const SfxPoolItem* pOld, const SfxPoolItem* pNew) : m_pOld(pOld), m_pNew(pNew) {}; - virtual ~LegacyModifyHint(); + virtual ~LegacyModifyHint() override; const SfxPoolItem* m_pOld; const SfxPoolItem* m_pNew; }; @@ -178,7 +178,7 @@ public: // a more universal broadcasting mechanism inline void CallSwClientNotify( const SfxHint& rHint ) const; - virtual ~SwModify(); + virtual ~SwModify() override; void Add(SwClient *pDepend); SwClient* Remove(SwClient *pDepend); diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx index de39a1c105f0..4610eaff6023 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -111,7 +111,7 @@ public: SbxValue( rVal ), bVoid(rVal.bVoid) {} - virtual ~SwSbxValue(); + virtual ~SwSbxValue() override; bool GetBool() const; double GetDouble() const; diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx index 3048ca91facc..f5bc84274b48 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -49,7 +49,7 @@ class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem public: SwCondCollItem(); - virtual ~SwCondCollItem(); + virtual ~SwCondCollItem() override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx index c0fd74552e04..22e4efd826fb 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -57,7 +57,7 @@ class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula public: SwTableBoxFormula( const OUString& rFormula ); - virtual ~SwTableBoxFormula() {}; + virtual ~SwTableBoxFormula() override {}; // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index fed2b5375c78..2657cd3b2755 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -38,7 +38,7 @@ protected: public: SwTableWidthDlg(vcl::Window *pParent, SwTableFUNC &rFnc ); - virtual ~SwTableWidthDlg(); + virtual ~SwTableWidthDlg() override; virtual void dispose() override; }; diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index dde40132e064..e83d9eeb829f 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -292,7 +292,7 @@ public: SwCursorShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr ); // disguised copy constructor SwCursorShell( SwCursorShell& rShell, vcl::Window *pWin ); - virtual ~SwCursorShell(); + virtual ~SwCursorShell() override; // create new cursor and append the old one virtual SwPaM & CreateNewShellCursor() override; diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index 5a9d07564bd3..83cfdf733fd0 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType public: SwDBFieldType(SwDoc* pDocPtr, const OUString& rColumnName, const SwDBData& rDBData); - virtual ~SwDBFieldType(); + virtual ~SwDBFieldType() override; virtual OUString GetName() const override; virtual SwFieldType* Copy() const override; @@ -69,7 +69,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField public: SwDBField(SwDBFieldType*, sal_uLong nFormat = 0); - virtual ~SwDBField(); + virtual ~SwDBField() override; virtual SwFieldType* ChgTyp( SwFieldType* ) override; diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 7e6a79c3c34c..b19c76c7322c 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -105,7 +105,7 @@ public: /// For reader. Only the connection is created. SwContact( SwFrameFormat *pToRegisterIn ); - virtual ~SwContact(); + virtual ~SwContact() override; virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const = 0; virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) = 0; @@ -197,7 +197,7 @@ public: /// Creates DrawObject and registers it with the Model. SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod ); - virtual ~SwFlyDrawContact(); + virtual ~SwFlyDrawContact() override; virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const override; virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) override; @@ -242,7 +242,7 @@ class SwDrawVirtObj : public SdrVirtObj SwDrawVirtObj( SdrObject& _rNewObj, SwDrawContact& _rDrawContact ); - virtual ~SwDrawVirtObj(); + virtual ~SwDrawVirtObj() override; /// access to offset virtual const Point GetOffset() const override; @@ -387,7 +387,7 @@ class SwDrawContact : public SwContact public: SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj ); - virtual ~SwDrawContact(); + virtual ~SwDrawContact() override; virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const override; virtual SwAnchoredObject* GetAnchoredObj( SdrObject* _pSdrObj ) override; diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 7e092e54bfb9..4dd95430c87a 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -43,7 +43,7 @@ class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType public: SwDDEFieldType( const OUString& rName, const OUString& rCmd, SfxLinkUpdateMode = SfxLinkUpdateMode::ONCALL ); - virtual ~SwDDEFieldType(); + virtual ~SwDDEFieldType() override; const OUString& GetExpansion() const { return aExpansion; } void SetExpansion( const OUString& rStr ) { aExpansion = rStr; @@ -89,7 +89,7 @@ private: public: SwDDEField(SwDDEFieldType*); - virtual ~SwDDEField(); + virtual ~SwDDEField() override; /** Get parameter via types. Name cannot be changed. */ diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx index b499c57af0e7..82f15ad899fe 100644 --- a/sw/inc/dlelstnr.hxx +++ b/sw/inc/dlelstnr.hxx @@ -59,7 +59,7 @@ class SwLinguServiceEventListener : public: SwLinguServiceEventListener(); - virtual ~SwLinguServiceEventListener(); + virtual ~SwLinguServiceEventListener() override; /// XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObj ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 793f6d2ebaed..3329c07c617d 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -447,7 +447,7 @@ public: // Life cycle SwDoc(); - virtual ~SwDoc(); + virtual ~SwDoc() override; bool IsInDtor() const { return mbDtor; } diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index ad4d58ab987d..c98f143983bd 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -188,7 +188,7 @@ public: SwFrameFormats(); // frees all SwFrameFormat! - virtual ~SwFrameFormats(); + virtual ~SwFrameFormats() override; void clear() { return m_Array.clear(); } bool empty() const { return m_Array.empty(); } diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index ac4345444f1d..28dcb0332615 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -168,7 +168,7 @@ public: SwDocShell( SfxObjectCreateMode eMode = SfxObjectCreateMode::EMBEDDED ); SwDocShell( SfxModelFlags i_nSfxCreationFlags ); SwDocShell( SwDoc *pDoc, SfxObjectCreateMode eMode = SfxObjectCreateMode::STANDARD ); - virtual ~SwDocShell(); + virtual ~SwDocShell() override; /// OLE 2.0-notification. DECL_LINK_TYPED( Ole2ModifiedHdl, bool, void ); diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index c8b526fe5196..79411a945b77 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -72,7 +72,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase std::unique_ptr<SfxItemSet> * o_ppFlatSet = nullptr); protected: - virtual ~SwDocStyleSheet(); + virtual ~SwDocStyleSheet() override; public: SwDocStyleSheet( SwDoc& rDoc, @@ -176,7 +176,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener public: SwStyleSheetIterator( SwDocStyleSheetPool* pBase, SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL ); - virtual ~SwStyleSheetIterator(); + virtual ~SwStyleSheetIterator() override; virtual sal_uInt16 Count() override; virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx) override; @@ -225,7 +225,7 @@ public: void InvalidateIterator(); protected: - virtual ~SwDocStyleSheetPool(); + virtual ~SwDocStyleSheetPool() override; private: SwDocStyleSheetPool( const SwDocStyleSheetPool& ) = delete; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 373be0ca7cec..4464dc65f3fc 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -454,7 +454,7 @@ public: const OUString& rInitials, const OUString& rName, const DateTime& rDate); - virtual ~SwPostItField(); + virtual ~SwPostItField() override; virtual OUString Expand() const override; virtual SwField* Copy() const override; diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index 76d44eb7784c..3bd14a21f176 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -35,7 +35,7 @@ class SwDPage : public FmFormPage, public SdrObjUserCall public: explicit SwDPage(SwDrawModel& rNewModel, bool bMasterPage=false); - virtual ~SwDPage(); + virtual ~SwDPage() override; virtual SwDPage* Clone() const override; virtual SwDPage* Clone(SdrModel* pNewModel) const override; diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx index 339fbc7f9c3d..60bd71cc8384 100644 --- a/sw/inc/drawdoc.hxx +++ b/sw/inc/drawdoc.hxx @@ -31,7 +31,7 @@ private: public: SwDrawModel( SwDoc* pDoc ); - virtual ~SwDrawModel(); + virtual ~SwDrawModel() override; const SwDoc& GetDoc() const { return *m_pDoc; } SwDoc& GetDoc() { return *m_pDoc; } diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index aef018e0377b..20a24a931536 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -941,7 +941,7 @@ public: /// Copy-Constructor in disguise. SwEditShell( SwEditShell&, vcl::Window* ); - virtual ~SwEditShell(); + virtual ~SwEditShell() override; private: SwEditShell(const SwEditShell &) = delete; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 8e84d2814fb3..9e62ee9facc8 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -319,7 +319,7 @@ public: sal_uInt16 nSubType = 0, sal_uLong nFormat = 0, bool bIsFormField = true ); - virtual ~SwInputField(); + virtual ~SwInputField() override; void SetFormatField( SwFormatField& rFormatField ); SwFormatField* GetFormatField() { return mpFormatField;} diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx index 28c962ef42c1..f6bb44beec91 100644 --- a/sw/inc/extinput.hxx +++ b/sw/inc/extinput.hxx @@ -34,7 +34,7 @@ class SwExtTextInput : public SwPaM LanguageType eInputLanguage; public: SwExtTextInput( const SwPaM& rPam, Ring* pRing = nullptr ); - virtual ~SwExtTextInput(); + virtual ~SwExtTextInput() override; void SetInputData( const CommandExtTextInputData& rData ); const std::vector<ExtTextInputAttr>& GetAttrs() const { return aAttrs; } diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index facab61d5585..2d6c77f20d7d 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -35,7 +35,7 @@ class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem, public SwClient public: /// single argument ctors shall be explicit. explicit SwFormatCharFormat( SwCharFormat *pFormat ); - virtual ~SwFormatCharFormat(); + virtual ~SwFormatCharFormat() override; /// @@@ public copy ctor, but no copy assignment? SwFormatCharFormat( const SwFormatCharFormat& rAttr ); diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index 550f1aafd0de..1c17dcf2293e 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -252,7 +252,7 @@ public: SwFEShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr ); SwFEShell( SwEditShell& rShell, vcl::Window *pWin ); - virtual ~SwFEShell(); + virtual ~SwFEShell() override; /// Copy and Paste methods for internal clipboard. bool Copy( SwDoc* pClpDoc, const OUString* pNewClpText = nullptr ); diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx index d197de6dcd84..4f4d3907d058 100644 --- a/sw/inc/finalthreadmanager.hxx +++ b/sw/inc/finalthreadmanager.hxx @@ -65,7 +65,7 @@ private: FinalThreadManager(FinalThreadManager &) = delete; void operator =(FinalThreadManager &) = delete; - virtual ~FinalThreadManager(); + virtual ~FinalThreadManager() override; void registerAsListenerAtDesktop(); diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index a516b22b5581..0c350e8f0bf0 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -405,7 +405,7 @@ protected: SwValueField( const SwValueField& rField ); public: - virtual ~SwValueField(); + virtual ~SwValueField() override; virtual SwFieldType* ChgTyp( SwFieldType* ) override; virtual void SetLanguage(sal_uInt16 nLng) override; diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index 5f667842b9c6..e7bdfbbd4375 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -39,7 +39,7 @@ public: /** Destructor */ - virtual ~SwDropDownFieldType(); + virtual ~SwDropDownFieldType() override; /** Create a copy of this field type. @@ -117,7 +117,7 @@ public: /** Destructor */ - virtual ~SwDropDownField(); + virtual ~SwDropDownField() override; /** Returns the selected value. diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx index 2dad3cb1aba3..c26cfa74c31d 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -46,7 +46,7 @@ class SW_DLLPUBLIC SwFormatAnchor: public SfxPoolItem public: SwFormatAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 ); SwFormatAnchor( const SwFormatAnchor &rCpy ); - virtual ~SwFormatAnchor(); + virtual ~SwFormatAnchor() override; SwFormatAnchor &operator=( const SwFormatAnchor& ); diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index b3fbbc0957ba..de022f122031 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -31,7 +31,7 @@ public: SwFormatAutoFormat( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT ); /// single argument ctors shall be explicit. - virtual ~SwFormatAutoFormat(); + virtual ~SwFormatAutoFormat() override; /// @@@ public copy ctor, but no copy assignment? SwFormatAutoFormat( const SwFormatAutoFormat& rAttr ); diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx index 85d7ead78e3a..0b904800de38 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -89,7 +89,7 @@ class SW_DLLPUBLIC SwFormatCol : public SfxPoolItem public: SwFormatCol(); SwFormatCol( const SwFormatCol& ); - virtual ~SwFormatCol(); + virtual ~SwFormatCol() override; //#i120133# sal_Int16 GetAdjustValue() const { return m_aWidthAdjustValue; } void SetAdjustValue( sal_Int16 n ) { m_aWidthAdjustValue = n; } diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx index 2403675f41fc..b8aa2b604dfa 100644 --- a/sw/inc/fmtcntnt.hxx +++ b/sw/inc/fmtcntnt.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem public: SwFormatContent( const SwStartNode* pStartNode = nullptr ); SwFormatContent( const SwFormatContent &rCpy ); - virtual ~SwFormatContent(); + virtual ~SwFormatContent() override; /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index e7e1b6346027..1a5269356b9d 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -186,7 +186,7 @@ public: sal_uLong nSubCond = 0 ); SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond, const OUString& rSubExp ); - virtual ~SwCollCondition(); + virtual ~SwCollCondition() override; /// @@@ public copy ctor, but no copy assignment? SwCollCondition( const SwCollCondition& rCpy ); @@ -223,7 +223,7 @@ protected: public: - virtual ~SwConditionTextFormatColl(); + virtual ~SwConditionTextFormatColl() override; const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const; const SwFormatCollConditions& GetCondColls() const { return m_CondColls; } diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index 65d658889fac..341f7d3445da 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -64,7 +64,7 @@ public: /// @@@ copy construction allowed, but copy assignment is not? @@@ SwFormatField( const SwFormatField& rAttr ); - virtual ~SwFormatField(); + virtual ~SwFormatField() override; /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index eadf2320240b..4a4a3deef3b2 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -52,7 +52,7 @@ class SW_DLLPUBLIC SwFormatFootnote public: SwFormatFootnote( bool bEndNote = false ); - virtual ~SwFormatFootnote(); + virtual ~SwFormatFootnote() override; /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 07390d66234e..26dc69ba7b67 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -39,7 +39,7 @@ public: SwFormatHeader( bool bOn = false ); SwFormatHeader( SwFrameFormat *pHeaderFormat ); SwFormatHeader( const SwFormatHeader &rCpy ); - virtual ~SwFormatHeader(); + virtual ~SwFormatHeader() override; SwFormatHeader& operator=( const SwFormatHeader &rCpy ); @@ -70,7 +70,7 @@ public: SwFormatFooter( bool bOn = false ); SwFormatFooter( SwFrameFormat *pFooterFormat ); SwFormatFooter( const SwFormatFooter &rCpy ); - virtual ~SwFormatFooter(); + virtual ~SwFormatFooter() override; SwFormatFooter& operator=( const SwFormatFooter &rCpy ); diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx index 892a536a6475..347a366a4326 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -46,7 +46,7 @@ public: SwFormatINetFormat( const OUString& rURL, const OUString& rTarget ); SwFormatINetFormat( const SwFormatINetFormat& rAttr ); SwFormatINetFormat(); ///< For TypeInfo. - virtual ~SwFormatINetFormat(); + virtual ~SwFormatINetFormat() override; static SfxPoolItem* CreateDefault(); diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx index 0560fa8c48f5..e510ea3ab819 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -33,7 +33,7 @@ class SW_DLLPUBLIC SwFormatLineNumber: public SfxPoolItem public: SwFormatLineNumber(); - virtual ~SwFormatLineNumber(); + virtual ~SwFormatLineNumber() override; static SfxPoolItem* CreateDefault(); diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 1ac8c050b3c5..5e655c034c5b 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -107,7 +107,7 @@ public: /// takes ownership explicit SwFormatMeta( std::shared_ptr< ::sw::Meta > const & i_pMeta, const sal_uInt16 i_nWhich ); - virtual ~SwFormatMeta(); + virtual ~SwFormatMeta() override; /// SfxPoolItem virtual bool operator==( const SfxPoolItem & ) const override; @@ -154,7 +154,7 @@ protected: public: explicit Meta(SwFormatMeta * const i_pFormat = nullptr); - virtual ~Meta(); + virtual ~Meta() override; /// sfx2::Metadatable virtual ::sfx2::IXmlIdRegistry& GetRegistry() override; diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 933e2d896499..e86fdef2a1b0 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -50,7 +50,7 @@ public: SwFormatPageDesc( const SwPageDesc *pDesc = nullptr ); SwFormatPageDesc( const SwFormatPageDesc &rCpy ); SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy ); - virtual ~SwFormatPageDesc(); + virtual ~SwFormatPageDesc() override; /// "Pure virtual methods" of SfxPoolItem. diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx index 1c1c578edec9..33bcc2361b6c 100644 --- a/sw/inc/fmtrfmrk.hxx +++ b/sw/inc/fmtrfmrk.hxx @@ -48,7 +48,7 @@ class SwFormatRefMark public: SwFormatRefMark( const OUString& rText ); SwFormatRefMark( const SwFormatRefMark& rRefMark ); - virtual ~SwFormatRefMark( ); + virtual ~SwFormatRefMark( ) override; /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 437a1d3d63db..dcf5575ce873 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwFormatRuby : public SfxPoolItem public: SwFormatRuby( const OUString& rRubyText ); SwFormatRuby( const SwFormatRuby& rAttr ); - virtual ~SwFormatRuby(); + virtual ~SwFormatRuby() override; SwFormatRuby& operator=( const SwFormatRuby& rAttr ); diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 9f338f9a9fb0..e6ea18b863a6 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -46,7 +46,7 @@ public: /// @@@ copy construction allowed, but assigment is not? @@@ SwFormatURL( const SwFormatURL& ); - virtual ~SwFormatURL(); + virtual ~SwFormatURL() override; /// "Pure virtual methods" of SfxPoolItem. virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index ca67be21402d..a4cc9201ba5a 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -36,7 +36,7 @@ public: sal_Int16 _nWrapInfluenceOnPosition = css::text::WrapInfluenceOnPosition::ONCE_CONCURRENT ); SwFormatWrapInfluenceOnObjPos( const SwFormatWrapInfluenceOnObjPos& _rCpy ); - virtual ~SwFormatWrapInfluenceOnObjPos(); + virtual ~SwFormatWrapInfluenceOnObjPos() override; SwFormatWrapInfluenceOnObjPos& operator=( const SwFormatWrapInfluenceOnObjPos& _rSource ); diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 1e01696df74d..f03c2e172622 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -73,7 +73,7 @@ protected: public: - virtual ~SwFormat(); + virtual ~SwFormat() override; SwFormat &operator=(const SwFormat&); /// for Querying of Writer-functions. diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 88c77f5b09a9..22db10be7030 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -83,7 +83,7 @@ protected: void SetOtherTextBoxFormat( SwFrameFormat *pFormat ); public: - virtual ~SwFrameFormat(); + virtual ~SwFrameFormat() override; /// Destroys all Frames in aDepend (Frames are identified via dynamic_cast). virtual void DelFrames(); @@ -182,7 +182,7 @@ protected: {} public: - virtual ~SwFlyFrameFormat(); + virtual ~SwFlyFrameFormat() override; /// Creates the views. virtual void MakeFrames() override; @@ -263,7 +263,7 @@ protected: {} public: - virtual ~SwDrawFrameFormat(); + virtual ~SwDrawFrameFormat() override; /** 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 2d35d10ab96f..fa74c335affc 100644 --- a/sw/inc/globdoc.hxx +++ b/sw/inc/globdoc.hxx @@ -28,7 +28,7 @@ public: SFX_DECL_OBJECTFACTORY(); SwGlobalDocShell(SfxObjectCreateMode eMode = SfxObjectCreateMode::EMBEDDED); - virtual ~SwGlobalDocShell(); + virtual ~SwGlobalDocShell() override; virtual void FillClass( SvGlobalName * pClassName, SotClipboardFormatId * pClipFormat, diff --git a/sw/inc/gotodlg.hxx b/sw/inc/gotodlg.hxx index b1d531a1a6d5..6d1d83339542 100644 --- a/sw/inc/gotodlg.hxx +++ b/sw/inc/gotodlg.hxx @@ -30,7 +30,7 @@ class SwGotoPageDlg : public ModalDialog public: SwGotoPageDlg(vcl::Window *parent = nullptr, SfxBindings* _pBindings = nullptr); - virtual ~SwGotoPageDlg(); + virtual ~SwGotoPageDlg() override; virtual void dispose() override; sal_uInt16 GetPageSelection() const{ diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index e7ab19790e23..59321343c6f1 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -97,7 +97,7 @@ public: sal_Int32 nConvOptions, bool bIsInteractive, bool bStart, bool bOther, bool bSelection ); - virtual ~SwHHCWrapper(); + virtual ~SwHHCWrapper() override; void Convert(); }; diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index d9f867ca6cef..d3e7d1422144 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -198,7 +198,7 @@ class SwAttrSetChg: public SwMsgPoolItem public: SwAttrSetChg( const SwAttrSet& rTheSet, SwAttrSet& rSet ); SwAttrSetChg( const SwAttrSetChg& ); - virtual ~SwAttrSetChg(); + virtual ~SwAttrSetChg() override; /// What has changed const SwAttrSet* GetChgSet() const { return m_pChgSet; } diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 73f2a43f7594..61e3f0dd2a17 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -80,7 +80,7 @@ class SwRevisionConfig : public utl::ConfigItem public: SwRevisionConfig(); - virtual ~SwRevisionConfig(); + virtual ~SwRevisionConfig() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); @@ -111,7 +111,7 @@ class SwCompareConfig : public utl::ConfigItem public: SwCompareConfig(); - virtual ~SwCompareConfig(); + virtual ~SwCompareConfig() override; virtual void Notify( const css::uno::Sequence< OUString >& ) override { }; void Load(); @@ -139,7 +139,7 @@ class SwInsertConfig : public utl::ConfigItem public: SwInsertConfig(bool bWeb); - virtual ~SwInsertConfig(); + virtual ~SwInsertConfig() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); @@ -166,7 +166,7 @@ class SwTableConfig : public utl::ConfigItem public: SwTableConfig(bool bWeb); - virtual ~SwTableConfig(); + virtual ~SwTableConfig() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); @@ -196,7 +196,7 @@ class SwMiscConfig : public utl::ConfigItem public: SwMiscConfig(); - virtual ~SwMiscConfig(); + virtual ~SwMiscConfig() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; void Load(); diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 2734d19a1ea2..f162b5e0cf70 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -116,7 +116,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode void onGraphicChanged(); public: - virtual ~SwGrfNode(); + virtual ~SwGrfNode() override; const Graphic& GetGrf(bool bWait = false) const; const GraphicObject& GetGrfObj(bool bWait = false) const; const GraphicObject* GetReplacementGrfObj() const; diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index f9e51d8f4dbc..f2e2d41de0b9 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -79,7 +79,7 @@ public: RegisterIndex( m_pNode->GetNodes() ); } - virtual ~SwNodeIndex() + virtual ~SwNodeIndex() override { DeRegisterIndex( m_pNode->GetNodes() ); } inline sal_uLong operator++(); diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 7affc6eb1412..cb8c4905eb76 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -49,7 +49,7 @@ protected: SwGrfFormatColl *pGrColl, SwAttrSet* pAutoAttr = nullptr ); public: - virtual ~SwNoTextNode(); + virtual ~SwNoTextNode() override; virtual SwContentFrame *MakeFrame( SwFrame* ) override; diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 6dc1b481ce9e..a20a4cced8d4 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -108,7 +108,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTextNode public: const SwOLEObj& GetOLEObj() const { return aOLEObj; } SwOLEObj& GetOLEObj() { return aOLEObj; } - virtual ~SwOLENode(); + virtual ~SwOLENode() override; virtual SwContentNode *SplitContentNode( const SwPosition & ) override; diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index abe845a604b3..15f634171706 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -228,7 +228,7 @@ public: inline bool HasHints() const { return m_pSwpHints != nullptr; } inline SwpHints &GetOrCreateSwpHints(); - virtual ~SwTextNode(); + virtual ~SwTextNode() override; virtual sal_Int32 Len() const override; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index b662c816eb49..173f3d0d215f 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -110,7 +110,7 @@ protected: public: /** the = 0 forces the class to be an abstract base class, but the dtor can be still called from subclasses */ - virtual ~SwNode() = 0; + virtual ~SwNode() override = 0; #ifdef DBG_UTIL long GetSerial() const { return m_nSerial; } @@ -363,7 +363,7 @@ protected: SwFormatColl *pFormatColl ); /** the = 0 forces the class to be an abstract base class, but the dtor can be still called from subclasses */ - virtual ~SwContentNode() = 0; + virtual ~SwContentNode() override = 0; /** Attribute-set for all auto attributes of a ContentNode. (e.g. TextNode or NoTextNode). */ @@ -492,7 +492,7 @@ class SW_DLLPUBLIC SwTableNode : public SwStartNode, public SwModify friend class SwNodes; SwTable* m_pTable; protected: - virtual ~SwTableNode(); + virtual ~SwTableNode() override; public: SwTableNode( const SwNodeIndex & ); @@ -535,7 +535,7 @@ private: std::unique_ptr<SwSection> const m_pSection; protected: - virtual ~SwSectionNode(); + virtual ~SwSectionNode() override; public: SwSectionNode(SwNodeIndex const&, diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 9073302845f0..8f3ade04f9de 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -65,7 +65,7 @@ public: SwNumFormat( const SwNumFormat& ); SwNumFormat( const SvxNumberFormat&, SwDoc* pDoc); - virtual ~SwNumFormat(); + virtual ~SwNumFormat() override; SwNumFormat& operator=( const SwNumFormat& ); diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 13eb80bb01c5..d234bfcf7769 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -274,7 +274,7 @@ public: { return m_StyleName < pd.m_StyleName; } SwPageDesc( const SwPageDesc& ); - virtual ~SwPageDesc(); + virtual ~SwPageDesc() override; }; namespace std { diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index d00771d152ac..2dc78ee5a315 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -177,7 +177,7 @@ public: const SwNode& rPt, sal_Int32 nPtContent, SwPaM* pRing = nullptr ); SwPaM( const SwNode& rNd, sal_Int32 nContent = 0, SwPaM* pRing = nullptr ); SwPaM( const SwNodeIndex& rNd, sal_Int32 nContent = 0, SwPaM* pRing = nullptr ); - virtual ~SwPaM(); + virtual ~SwPaM() override; /// this takes a second parameter, which indicates the Ring that /// the new PaM should be part of (may be null) diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index 7aed926aeed0..00be3cb5a0fb 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -62,7 +62,7 @@ public: static SfxPoolItem* CreateDefault(); SwFormatDrop(); - virtual ~SwFormatDrop(); + virtual ~SwFormatDrop() override; // @@@ public copy ctor, but no copy assignment? SwFormatDrop( const SwFormatDrop & ); diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 9642a7e0dffa..0c9fe92da682 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -128,7 +128,7 @@ public: { } - virtual ~SwAnnotationItem() + virtual ~SwAnnotationItem() override { } diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx index 0e4004ba2449..2bab12840019 100644 --- a/sw/inc/prtopt.hxx +++ b/sw/inc/prtopt.hxx @@ -33,7 +33,7 @@ private: public: SwPrintOptions(bool bWeb); - virtual ~SwPrintOptions(); + virtual ~SwPrintOptions() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; virtual void doSetModified( ) override { m_bModified = true; SetModified();} diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 8a9a1f0433c6..f6a0eacc97b4 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -57,7 +57,7 @@ class SwRedlineExtraData_FormatColl : public SwRedlineExtraData public: SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId, const SfxItemSet* pSet = nullptr ); - virtual ~SwRedlineExtraData_FormatColl(); + virtual ~SwRedlineExtraData_FormatColl() override; virtual SwRedlineExtraData* CreateNew() const override; virtual void Reject( SwPaM& rPam ) const override; virtual bool operator == ( const SwRedlineExtraData& ) const override; @@ -73,7 +73,7 @@ class SwRedlineExtraData_Format : public SwRedlineExtraData public: SwRedlineExtraData_Format( const SfxItemSet& rSet ); - virtual ~SwRedlineExtraData_Format(); + virtual ~SwRedlineExtraData_Format() override; virtual SwRedlineExtraData* CreateNew() const override; virtual void Reject( SwPaM& rPam ) const override; virtual bool operator == ( const SwRedlineExtraData& ) const override; @@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwRedlineExtraData_FormattingChanges : public SwRedlineExtraD public: SwRedlineExtraData_FormattingChanges( const SfxItemSet* pItemSet ); - virtual ~SwRedlineExtraData_FormattingChanges(); + virtual ~SwRedlineExtraData_FormattingChanges() override; virtual SwRedlineExtraData* CreateNew() const override; virtual void Reject( SwPaM& rPam ) const override; virtual bool operator == ( const SwRedlineExtraData& ) const override; @@ -201,7 +201,7 @@ public: bDelLastPara( bDelLP ), bIsVisible( true ) {} SwRangeRedline( const SwRangeRedline& ); - virtual ~SwRangeRedline(); + virtual ~SwRangeRedline() override; SwNodeIndex* GetContentIdx() const { return pContentSect; } // For Undo. @@ -303,7 +303,7 @@ private: public: SwTableRowRedline(const SwRedlineData& rData, const SwTableLine& rTableLine); - virtual ~SwTableRowRedline(); + virtual ~SwTableRowRedline() override; /** ExtraData gets copied, the pointer is therefore not taken over by * the RedLineObject.*/ @@ -324,7 +324,7 @@ private: public: SwTableCellRedline(const SwRedlineData& rData, const SwTableBox& rTableBox); - virtual ~SwTableCellRedline(); + virtual ~SwTableCellRedline() override; /** ExtraData gets copied, the pointer is therefore not taken over by * the RedLineObject.*/ diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 5257afea4ba1..bb82c5331801 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -99,7 +99,7 @@ public: SwGetRefField( SwGetRefFieldType*, const OUString& rSetRef, sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFormat ); - virtual ~SwGetRefField(); + virtual ~SwGetRefField() override; virtual OUString GetFieldName() const override; diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index bb5db7aa160f..a84df08797dd 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -160,7 +160,7 @@ public: SwSection(SectionType const eType, OUString const& rName, SwSectionFormat & rFormat); - virtual ~SwSection(); + virtual ~SwSection() override; bool DataEquals(SwSectionData const& rCmp) const; @@ -256,7 +256,7 @@ class SwSectionFrameMoveAndDeleteHint : public SfxSimpleHint , mbSaveContent( bSaveContent ) {} - virtual ~SwSectionFrameMoveAndDeleteHint() + virtual ~SwSectionFrameMoveAndDeleteHint() override {} bool IsSaveContent() const @@ -289,7 +289,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override; public: - virtual ~SwSectionFormat(); + virtual ~SwSectionFormat() override; // Deletes all Frames in aDepend (Frames are recognized via dynamic_cast). virtual void DelFrames() override; diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index a18f65be3fb1..df75e6f20444 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -405,7 +405,7 @@ public: bool bOrganizerMode : 1; Writer(); - virtual ~Writer(); + virtual ~Writer() override; virtual sal_uLong Write( SwPaM&, SfxMedium&, const OUString* ); sal_uLong Write( SwPaM&, SvStream&, const OUString* ); diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index e9c41853eeae..5ca345548dc1 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -47,7 +47,7 @@ protected: public: SwAutoCorrect( const SvxAutoCorrect& rACorr ); - virtual ~SwAutoCorrect(); + virtual ~SwAutoCorrect() override; }; #endif diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 13bc7bc8d2b7..ac101784c5b5 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -162,7 +162,7 @@ private: public: SwAttrPool( SwDoc* pDoc ); protected: - virtual ~SwAttrPool(); + virtual ~SwAttrPool() override; public: SwDoc* GetDoc() { return m_pDoc; } diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index b50f84a3c851..f87a70763249 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -37,7 +37,7 @@ public: : ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ), bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ) {} - virtual ~SwBaseLink(); + virtual ~SwBaseLink() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const css::uno::Any & rValue ) override; diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index b8c269a2ddc9..f5c59e033a02 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -95,7 +95,7 @@ protected: public: // single argument ctors shall be explicit. SwCursor( const SwPosition &rPos, SwPaM* pRing ); - virtual ~SwCursor(); + virtual ~SwCursor() override; /// this takes a second parameter, which indicates the Ring that /// the new cursor should be part of (may be null) @@ -273,7 +273,7 @@ protected: public: SwTableCursor( const SwPosition &rPos ); SwTableCursor( SwTableCursor& ); - virtual ~SwTableCursor(); + virtual ~SwTableCursor() override; virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual, bool bSkipHidden, bool bInsertCursor ) override; diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 73eeb5b2c519..ea56c56b6be9 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -32,7 +32,7 @@ public: // After that SwTable is empty and has to be deleted. SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, bool bUpdate = true ); - virtual ~SwDDETable(); + virtual ~SwDDETable() override; void ChangeContent(); bool NoDDETable(); diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 8ecbc4676f43..c7bc02d15da0 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -132,7 +132,7 @@ public: SfxObjectFactory* pWebFact, SfxObjectFactory* pGlobalFact ); - virtual ~SwModule(); + virtual ~SwModule() override; // Set view for internal use only. It is public only for technical reasons. inline void SetView(SwView* pVw) { m_pView = pVw; } diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index 9a9ad1e610fd..4c51c8785940 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -56,7 +56,7 @@ public: { CNTNT_TYPE.pSectNd = &rSectNd; } - virtual ~SwServerObject(); + virtual ~SwServerObject() override; virtual bool GetData( css::uno::Any & rData, const OUString & rMimeType, diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 619bd8f08920..596bd6b9b9f3 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -129,7 +129,7 @@ public: explicit SwTable(); - virtual ~SwTable(); + virtual ~SwTable() override; // @@@ public copy ctor, but no copy assignment? SwTable( const SwTable& rTable ); // no copy of the lines !! @@ -338,7 +338,7 @@ class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat. public: SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp ); - virtual ~SwTableLine(); + virtual ~SwTableLine() override; SwTableBoxes &GetTabBoxes() { return m_aBoxes; } const SwTableBoxes &GetTabBoxes() const { return m_aBoxes; } @@ -402,7 +402,7 @@ public: SwTableBox( SwTableBoxFormat*, sal_uInt16 nLines, SwTableLine *pUp = nullptr ); SwTableBox( SwTableBoxFormat*, const SwStartNode&, SwTableLine *pUp = nullptr ); SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = nullptr ); - virtual ~SwTableBox(); + virtual ~SwTableBox() override; SwTableLines &GetTabLines() { return m_aLines; } const SwTableLines &GetTabLines() const { return m_aLines; } diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 73802995ea12..e163a042e165 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -48,7 +48,7 @@ private: public: SwTextGridItem(); - virtual ~SwTextGridItem(); + virtual ~SwTextGridItem() override; // "pure virtual methods" of SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index e0656b6fda4f..eb6a28f1dfce 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -86,7 +86,7 @@ public: // single argument ctors shall be explicit. explicit SwTOXMark( const SwTOXType* pTyp ); - virtual ~SwTOXMark(); + virtual ~SwTOXMark() override; SwTOXMark( const SwTOXMark& rCopy ); SwTOXMark& operator=( const SwTOXMark& rCopy ); @@ -418,7 +418,7 @@ public: SwTOXBase( const SwTOXType* pTyp, const SwForm& rForm, sal_uInt16 nCreaType, const OUString& rTitle ); SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = nullptr ); - virtual ~SwTOXBase(); + virtual ~SwTOXBase() override; virtual bool GetInfo( SfxPoolItem& rInfo ) const override; diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index 1efbe7b92e29..0a01e00f0f11 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -140,7 +140,7 @@ class SwTextAttrNesting : public SwTextAttrEnd protected: SwTextAttrNesting( SfxPoolItem & i_rAttr, const sal_Int32 i_nStart, const sal_Int32 i_nEnd ); - virtual ~SwTextAttrNesting(); + virtual ~SwTextAttrNesting() override; }; inline const sal_Int32* SwTextAttr::End() const diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx index b28c0829a546..0dd5c9d644de 100644 --- a/sw/inc/txtannotationfld.hxx +++ b/sw/inc/txtannotationfld.hxx @@ -33,7 +33,7 @@ public: sal_Int32 const nStart, bool const bInClipboard ); - virtual ~SwTextAnnotationField(); + virtual ~SwTextAnnotationField() override; ::sw::mark::IMark* GetAnnotationMark() const; }; diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index 2712a7c7264d..02ee37d3eeb6 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -36,7 +36,7 @@ class SwTextCharFormat : public SwTextAttrEnd public: SwTextCharFormat( SwFormatCharFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); - virtual ~SwTextCharFormat( ); + virtual ~SwTextCharFormat( ) override; // Passed from SwFormatCharFormat (no derivation from SwClient!). void ModifyNotification( const SfxPoolItem*, const SfxPoolItem* ); @@ -64,7 +64,7 @@ public: sal_Int32 const i_nStart, sal_Int32 const i_nEnd, bool const i_bIsCopy); - virtual ~SwTextMeta(); + virtual ~SwTextMeta() override; void ChgTextNode(SwTextNode * const pNode); }; @@ -77,7 +77,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwTextRuby( SwFormatRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); - virtual ~SwTextRuby(); + virtual ~SwTextRuby() override; virtual bool GetInfo( SfxPoolItem& rInfo ) const override; diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index 2c8decf4f29f..e389b4725ad8 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -39,7 +39,7 @@ public: sal_Int32 const nStart, bool const bInClipboard ); - virtual ~SwTextField(); + virtual ~SwTextField() override; void CopyTextField( SwTextField *pDest ) const; @@ -85,7 +85,7 @@ public: sal_Int32 const nEnd, bool const bInClipboard ); - virtual ~SwTextInputField(); + virtual ~SwTextInputField() override; void LockNotifyContentChange(); void UnlockNotifyContentChange(); diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index ea72481a8f98..7bd3bad988b5 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwTextFootnote : public SwTextAttr public: SwTextFootnote( SwFormatFootnote& rAttr, sal_Int32 nStart ); - virtual ~SwTextFootnote(); + virtual ~SwTextFootnote() override; inline SwNodeIndex *GetStartNode() const { return m_pStartNode; } void SetStartNode( const SwNodeIndex *pNode, bool bDelNodes = true ); diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 6f9dd900a772..409e46843d6f 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -37,7 +37,7 @@ virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; public: SwTextINetFormat( SwFormatINetFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd ); - virtual ~SwTextINetFormat(); + virtual ~SwTextINetFormat() override; virtual bool GetInfo( SfxPoolItem& rInfo ) const override; diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx index 6538582889fc..4a5f29ec5b7e 100644 --- a/sw/inc/txttxmrk.hxx +++ b/sw/inc/txttxmrk.hxx @@ -33,7 +33,7 @@ class SwTextTOXMark : public SwTextAttrEnd public: SwTextTOXMark( SwTOXMark& rAttr, sal_Int32 const nStart, sal_Int32 const*const pEnd = nullptr); - virtual ~SwTextTOXMark(); + virtual ~SwTextTOXMark() override; virtual sal_Int32 *GetEnd() override; // SwTextAttr diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 5d3e0d30ae8e..d081e63b90d5 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -95,7 +95,7 @@ private: public: SwUndo(SwUndoId const nId, const SwDoc* pDoc); - virtual ~SwUndo(); + virtual ~SwUndo() override; /** Returns textual comment for this undo object. @@ -239,7 +239,7 @@ protected: SwUndoInserts( SwUndoId nUndoId, const SwPaM& ); public: - virtual ~SwUndoInserts(); + virtual ~SwUndoInserts() override; virtual void UndoImpl( ::sw::UndoRedoContext & ) override; virtual void RedoImpl( ::sw::UndoRedoContext & ) override; @@ -280,7 +280,7 @@ protected: sal_uLong GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); } public: - virtual ~SwUndoFlyBase(); + virtual ~SwUndoFlyBase() override; }; @@ -291,7 +291,7 @@ class SwUndoInsLayFormat : public SwUndoFlyBase public: SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx ); - virtual ~SwUndoInsLayFormat(); + virtual ~SwUndoInsLayFormat() override; virtual void UndoImpl( ::sw::UndoRedoContext & ) override; virtual void RedoImpl( ::sw::UndoRedoContext & ) override; diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 1ed58e83fa8c..3309501069d1 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -159,7 +159,7 @@ protected: public: SwChartDataProvider( const SwDoc* pDoc ); - virtual ~SwChartDataProvider(); + virtual ~SwChartDataProvider() override; // XDataProvider virtual sal_Bool SAL_CALL createDataSourcePossible( const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) throw (css::uno::RuntimeException, std::exception) override; @@ -221,7 +221,7 @@ class SwChartDataSource : public: SwChartDataSource( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > &rLDS ); - virtual ~SwChartDataSource(); + virtual ~SwChartDataSource() override; // XDataSource virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences( ) throw (css::uno::RuntimeException, std::exception) override; @@ -280,7 +280,7 @@ public: SwChartDataSequence( SwChartDataProvider &rProvider, SwFrameFormat &rTableFormat, std::shared_ptr<SwUnoCursor> pTableCursor ); - virtual ~SwChartDataSequence(); + virtual ~SwChartDataSequence() override; static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId(); @@ -377,7 +377,7 @@ class SwChartLabeledDataSequence : public: SwChartLabeledDataSequence(); - virtual ~SwChartLabeledDataSequence(); + virtual ~SwChartLabeledDataSequence() override; // XLabeledDataSequence virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx index a3746624eec3..3a830353ae38 100644 --- a/sw/inc/unocoll.hxx +++ b/sw/inc/unocoll.hxx @@ -274,7 +274,7 @@ class SW_DLLPUBLIC SwXTextTables : public SwCollectionBaseClass, public SwUnoCollection { protected: - virtual ~SwXTextTables(); + virtual ~SwXTextTables() override; public: SwXTextTables(SwDoc* pDoc); @@ -313,7 +313,7 @@ class SW_DLLPUBLIC SwXFrames : public SwXFramesBaseClass, { const FlyCntType m_eType; protected: - virtual ~SwXFrames(); + virtual ~SwXFrames() override; public: SwXFrames(SwDoc* pDoc, FlyCntType eSet); @@ -342,7 +342,7 @@ public: class SwXTextFrames : public SwXFrames { protected: - virtual ~SwXTextFrames(); + virtual ~SwXTextFrames() override; public: SwXTextFrames(SwDoc* pDoc); @@ -356,7 +356,7 @@ public: class SwXTextGraphicObjects : public SwXFrames { protected: - virtual ~SwXTextGraphicObjects(); + virtual ~SwXTextGraphicObjects() override; public: SwXTextGraphicObjects(SwDoc* pDoc); @@ -370,7 +370,7 @@ public: class SwXTextEmbeddedObjects : public SwXFrames { protected: - virtual ~SwXTextEmbeddedObjects(); + virtual ~SwXTextEmbeddedObjects() override; public: SwXTextEmbeddedObjects(SwDoc* pDoc); @@ -385,7 +385,7 @@ class SwXTextSections : public SwCollectionBaseClass, public SwUnoCollection { protected: - virtual ~SwXTextSections(); + virtual ~SwXTextSections() override; public: SwXTextSections(SwDoc* pDoc); @@ -414,7 +414,7 @@ class SwXBookmarks : public SwCollectionBaseClass, public SwUnoCollection { protected: - virtual ~SwXBookmarks(); + virtual ~SwXBookmarks() override; public: SwXBookmarks(SwDoc* pDoc); @@ -445,7 +445,7 @@ class SwXNumberingRulesCollection : public cppu::WeakImplHelper public SwUnoCollection { protected: - virtual ~SwXNumberingRulesCollection(); + virtual ~SwXNumberingRulesCollection() override; public: SwXNumberingRulesCollection( SwDoc* pDoc ); @@ -473,7 +473,7 @@ class SwXFootnotes : public SwSimpleIndexAccessBaseClass, const bool m_bEndnote; protected: - virtual ~SwXFootnotes(); + virtual ~SwXFootnotes() override; public: SwXFootnotes(bool bEnd, SwDoc* pDoc); @@ -497,7 +497,7 @@ class SwXReferenceMarks : public SwCollectionBaseClass, public SwUnoCollection { protected: - virtual ~SwXReferenceMarks(); + virtual ~SwXReferenceMarks() override; public: SwXReferenceMarks(SwDoc* pDoc); diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index a06fd71bdf77..4af347a7fe0e 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -27,7 +27,7 @@ namespace sw struct SW_DLLPUBLIC DocDisposingHint final : public SfxHint { DocDisposingHint() {} - virtual ~DocDisposingHint(); + virtual ~DocDisposingHint() override; }; } @@ -40,7 +40,7 @@ private: public: SwUnoCursor( const SwPosition &rPos ); - virtual ~SwUnoCursor(); + virtual ~SwUnoCursor() override; protected: @@ -86,7 +86,7 @@ class SwUnoTableCursor : public virtual SwUnoCursor, public virtual SwTableCurso public: SwUnoTableCursor( const SwPosition& rPos ); - virtual ~SwUnoTableCursor(); + virtual ~SwUnoTableCursor() override; // Does a selection of content exist in table? // Return value indicates if the cursor remains at its old position. diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 439223af6f20..64facb537236 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -44,7 +44,7 @@ class SwFmDrawPage : public SvxFmDrawPage SdrPageView* pPageView; public: SwFmDrawPage( SdrPage* pPage ); - virtual ~SwFmDrawPage() throw (); + virtual ~SwFmDrawPage() throw () override; const SdrMarkList& PreGroup(const css::uno::Reference< css::drawing::XShapes >& rShapes); void PreUnGroup(const css::uno::Reference< css::drawing::XShapeGroup >& rShapeGroup); @@ -75,7 +75,7 @@ class SwXDrawPage : public SwXDrawPageBaseClass SwFmDrawPage* pDrawPage; public: SwXDrawPage(SwDoc* pDoc); - virtual ~SwXDrawPage(); + virtual ~SwXDrawPage() override; //XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception ) override; @@ -213,7 +213,7 @@ class SwXShape : public SwXShapeBaseClass, css::uno::RuntimeException); protected: - virtual ~SwXShape(); + virtual ~SwXShape() override; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; @@ -276,7 +276,7 @@ class SwXGroupShape : public css::drawing::XShapes { protected: - virtual ~SwXGroupShape(); + virtual ~SwXGroupShape() override; public: SwXGroupShape(css::uno::Reference< css::uno::XInterface > & xShape); diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx index 722960cc9df5..7bc0660af302 100644 --- a/sw/inc/unofieldcoll.hxx +++ b/sw/inc/unofieldcoll.hxx @@ -38,7 +38,7 @@ class SwXTextFieldMasters , public SwUnoCollection { protected: - virtual ~SwXTextFieldMasters(); + virtual ~SwXTextFieldMasters() override; public: SwXTextFieldMasters(SwDoc* pDoc); @@ -89,7 +89,7 @@ private: std::unique_ptr<Impl> m_pImpl; // currently does not need UnoImplPtr protected: - virtual ~SwXTextFieldTypes(); + virtual ~SwXTextFieldTypes() override; public: SwXTextFieldTypes(SwDoc* pDoc); diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 56df9dfee0e6..27e8dc01ef46 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -76,7 +76,7 @@ protected: css::uno::Reference< css::container::XNameAccess > mxStyleFamily; virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; - virtual ~SwXFrame(); + virtual ~SwXFrame() override; SwXFrame(FlyCntType eSet, const SfxItemPropertySet* pPropSet, @@ -178,7 +178,7 @@ protected: CreateCursor() throw (css::uno::RuntimeException) override; - virtual ~SwXTextFrame(); + virtual ~SwXTextFrame() override; SwXTextFrame(SwDoc *pDoc); SwXTextFrame(SwFrameFormat& rFormat); @@ -249,7 +249,7 @@ class SwXTextGraphicObject : public SwXTextGraphicObjectBaseClass protected: friend class SwXFrame; // just for CreateXFrame - virtual ~SwXTextGraphicObject(); + virtual ~SwXTextGraphicObject() override; SwXTextGraphicObject( SwDoc *pDoc ); SwXTextGraphicObject(SwFrameFormat& rFormat); @@ -284,7 +284,7 @@ class SwXTextEmbeddedObject : public SwXTextEmbeddedObjectBaseClass protected: friend class SwXFrame; // just for CreateXFrame - virtual ~SwXTextEmbeddedObject(); + virtual ~SwXTextEmbeddedObject() override; SwXTextEmbeddedObject( SwDoc *pDoc ); SwXTextEmbeddedObject(SwFrameFormat& rFormat); @@ -323,7 +323,7 @@ class SwXOLEListener : public cppu::WeakImplHelper SwFormat* GetFormat() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); } public: SwXOLEListener(SwFormat& rOLEFormat, css::uno::Reference< css::frame::XModel > const & xOLE); - virtual ~SwXOLEListener(); + virtual ~SwXOLEListener() override; // css::lang::XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/sw/inc/unoidxcoll.hxx b/sw/inc/unoidxcoll.hxx index 033c2c4f307a..bd33abbfb10c 100644 --- a/sw/inc/unoidxcoll.hxx +++ b/sw/inc/unoidxcoll.hxx @@ -28,7 +28,7 @@ class SwXDocumentIndexes private: - virtual ~SwXDocumentIndexes(); + virtual ~SwXDocumentIndexes() override; public: diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index 4515bbfa9584..c15d3db4a6ee 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -70,7 +70,7 @@ private: class Impl; ::sw::UnoImplPtr<Impl> m_pImpl; - virtual ~SwXParagraph(); + virtual ~SwXParagraph() override; SwXParagraph(css::uno::Reference< css::text::XText > const & xParent, SwTextNode & rTextNode, diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index 48d86a7230b4..38476880edca 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); - virtual ~SwXRedline(); + virtual ~SwXRedline() override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index 4f302b2b5767..db98d1c6f7c4 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -41,7 +41,7 @@ class SwXRedlines : public SwRedlinesBaseClass, public SwUnoCollection { protected: - virtual ~SwXRedlines(); + virtual ~SwXRedlines() override; public: SwXRedlines(SwDoc* pDoc); @@ -71,7 +71,7 @@ class SwXRedlineEnumeration SwDoc* pDoc; sal_uInt16 nCurrentIndex; protected: - virtual ~SwXRedlineEnumeration(); + virtual ~SwXRedlineEnumeration() override; public: SwXRedlineEnumeration(SwDoc& rDoc); diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index ad80037d3797..21e1d69196af 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -49,7 +49,7 @@ class SwXFootnoteProperties : public cppu::WeakAggImplHelper2 SwDoc* pDoc; const SfxItemPropertySet* m_pPropertySet; protected: - virtual ~SwXFootnoteProperties(); + virtual ~SwXFootnoteProperties() override; public: SwXFootnoteProperties(SwDoc* pDoc); @@ -79,7 +79,7 @@ class SwXEndnoteProperties : public cppu::WeakAggImplHelper2 SwDoc* pDoc; const SfxItemPropertySet* m_pPropertySet; protected: - virtual ~SwXEndnoteProperties(); + virtual ~SwXEndnoteProperties() override; public: SwXEndnoteProperties(SwDoc* pDoc); @@ -109,7 +109,7 @@ class SwXLineNumberingProperties : public cppu::WeakAggImplHelper2 SwDoc* pDoc; const SfxItemPropertySet* m_pPropertySet; protected: - virtual ~SwXLineNumberingProperties(); + virtual ~SwXLineNumberingProperties() override; public: SwXLineNumberingProperties(SwDoc* pDoc); @@ -152,7 +152,7 @@ private: const SfxItemPropertySet* m_pPropertySet; bool bOwnNumRuleCreated; protected: - virtual ~SwXNumberingRules(); + virtual ~SwXNumberingRules() override; public: SwXNumberingRules(SwDocShell& rDocSh); // chapter numbering @@ -223,7 +223,7 @@ public: class SwXChapterNumbering : public SwXNumberingRules { protected: - virtual ~SwXChapterNumbering(); + virtual ~SwXChapterNumbering() override; public: SwXChapterNumbering(SwDocShell& rDocSh); @@ -261,7 +261,7 @@ class SwXTextColumns : public cppu::WeakAggImplHelper4 sal_Int8 nSepLineStyle; protected: - virtual ~SwXTextColumns(); + virtual ~SwXTextColumns() override; public: SwXTextColumns(); SwXTextColumns(const SwFormatCol& rFormatCol); diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index f2cd2c62151a..7cc1af65ada0 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -64,7 +64,7 @@ class SwXTextSearch : public cppu::WeakImplHelper bool m_bIsValueSearch :1; protected: - virtual ~SwXTextSearch(); + virtual ~SwXTextSearch() override; public: SwXTextSearch(); diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 57e7b5fe8765..7ce92cc73979 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -67,7 +67,7 @@ class SwXStyleFamilies : public cppu::WeakImplHelper std::map<SfxStyleFamily, css::uno::Reference<css::container::XNameContainer>> m_vFamilies; protected: - virtual ~SwXStyleFamilies(); + virtual ~SwXStyleFamilies() override; public: SwXStyleFamilies(SwDocShell& rDocShell); @@ -130,7 +130,7 @@ class SwXAutoStyles : css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoCharStyles; css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoRubyStyles; css::uno::Reference< css::style::XAutoStyleFamily > m_xAutoParaStyles; - virtual ~SwXAutoStyles(); + virtual ~SwXAutoStyles() override; public: SwXAutoStyles(SwDocShell& rDocShell); @@ -162,7 +162,7 @@ protected: public: SwXAutoStyleFamily(SwDocShell* pDocShell, IStyleAccess::SwAutoStyleFamily eFamily); - virtual ~SwXAutoStyleFamily(); + virtual ~SwXAutoStyleFamily() override; //XAutoStyleFamily virtual css::uno::Reference< css::style::XAutoStyle > SAL_CALL insertStyle( const css::uno::Sequence< css::beans::PropertyValue >& Values ) throw (css::uno::RuntimeException, std::exception) override; @@ -182,7 +182,7 @@ class SwXAutoStylesEnumerator : public cppu::WeakImplHelper< css::container::XEn SwAutoStylesEnumImpl *m_pImpl; public: SwXAutoStylesEnumerator( SwDoc* pDoc, IStyleAccess::SwAutoStyleFamily eFam ); - virtual ~SwXAutoStylesEnumerator(); + virtual ~SwXAutoStylesEnumerator() override; //XEnumeration virtual sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException, std::exception) override; @@ -210,7 +210,7 @@ private: public: SwXAutoStyle( SwDoc* pDoc, std::shared_ptr<SfxItemSet> const & pInitSet, IStyleAccess::SwAutoStyleFamily eFam ); - virtual ~SwXAutoStyle(); + virtual ~SwXAutoStyle() override; //XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index d902c84c1e27..498fe5ebbe9b 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -84,7 +84,7 @@ protected: bool IsValid() const; - virtual ~SwXCell(); + virtual ~SwXCell() override; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; @@ -167,7 +167,7 @@ class SwXTextTableRow final : public cppu::WeakImplHelper SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTextTableRow*>(this)->GetFrameFormat(); } protected: - virtual ~SwXTextTableRow(); + virtual ~SwXTextTableRow() override; //SwClient virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; virtual void SwClientNotify(const SwModify&, const SfxHint&) override; @@ -272,7 +272,7 @@ public: SwUnoCursor& GetCursor(); sw::UnoCursorPointer m_pUnoCursor; SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } - virtual ~SwXTextTableCursor() { }; + virtual ~SwXTextTableCursor() override { }; }; struct SwRangeDescriptor @@ -305,7 +305,7 @@ private: SwXTextTable(); SwXTextTable(SwFrameFormat& rFrameFormat); - virtual ~SwXTextTable(); + virtual ~SwXTextTable() override; public: static css::uno::Reference<css::text::XTextTable> @@ -426,7 +426,7 @@ private: ::sw::UnoImplPtr<Impl> m_pImpl; SwXCellRange(const sw::UnoCursorPointer& pCursor, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc); - virtual ~SwXCellRange(); + virtual ~SwXCellRange() override; public: static ::rtl::Reference<SwXCellRange> CreateXCellRange( @@ -514,7 +514,7 @@ private: SwFrameFormat* GetFrameFormat(); const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTableRows*>(this)->GetFrameFormat(); } protected: - virtual ~SwXTableRows(); + virtual ~SwXTableRows() override; public: SwXTableRows(SwFrameFormat& rFrameFormat); @@ -552,7 +552,7 @@ private: ::sw::UnoImplPtr<Impl> m_pImpl; SwFrameFormat* GetFrameFormat() const; protected: - virtual ~SwXTableColumns(); + virtual ~SwXTableColumns() override; public: SwXTableColumns(SwFrameFormat& rFrameFormat); diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index d7cbf58a4303..41168442a24d 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -45,7 +45,7 @@ class SwXBodyText protected: - virtual ~SwXBodyText(); + virtual ~SwXBodyText() override; public: @@ -127,7 +127,7 @@ protected: CreateCursor() throw (css::uno::RuntimeException) override; - virtual ~SwXHeadFootText(); + virtual ~SwXHeadFootText() override; SwXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader); diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index 998a092e326d..b3a57127f2d7 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -74,7 +74,7 @@ private: class Impl; ::sw::UnoImplPtr<Impl> m_pImpl; - virtual ~SwXTextCursor(); + virtual ~SwXTextCursor() override; public: diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index 785d9dbac41d..11613bb12499 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -48,7 +48,7 @@ private: public: SwUnoInternalPaM(SwDoc& rDoc); - virtual ~SwUnoInternalPaM(); + virtual ~SwUnoInternalPaM() override; SwUnoInternalPaM& operator=(const SwPaM& rPaM); }; @@ -104,7 +104,7 @@ private: throw (css::uno::RuntimeException); void Invalidate(); - virtual ~SwXTextRange(); + virtual ~SwXTextRange() override; public: diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index a374f8df9987..6b6087db685d 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -203,7 +203,7 @@ private: using SfxBaseModel::removeEventListener; protected: - virtual ~SwXTextDocument(); + virtual ~SwXTextDocument() override; public: SwXTextDocument(SwDocShell* pShell); @@ -479,7 +479,7 @@ class SwXLinkTargetSupplier : public cppu::WeakImplHelper public: SwXLinkTargetSupplier(SwXTextDocument& rxDoc); - virtual ~SwXLinkTargetSupplier(); + virtual ~SwXLinkTargetSupplier() override; //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; @@ -517,7 +517,7 @@ public: const OUString& rLinkDisplayName, const OUString& sSuffix); SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, const OUString& rLinkDisplayName, const OUString& sSuffix); - virtual ~SwXLinkNameAccessWrapper(); + virtual ~SwXLinkNameAccessWrapper() override; //XNameAccess virtual css::uno::Any SAL_CALL getByName(const OUString& Name) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) override; @@ -558,7 +558,7 @@ class SwXOutlineTarget : public cppu::WeakImplHelper public: SwXOutlineTarget(const OUString& rOutlineText); - virtual ~SwXOutlineTarget(); + virtual ~SwXOutlineTarget() override; //XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; @@ -588,7 +588,7 @@ class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable SwDoc* m_pDoc; public: SwXDocumentPropertyHelper(SwDoc& rDoc); - virtual ~SwXDocumentPropertyHelper(); + virtual ~SwXDocumentPropertyHelper() override; css::uno::Reference<css::uno::XInterface> GetDrawTable(short nWhich); void Invalidate(); diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 636e917ef922..6222b6a48bc8 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -602,7 +602,7 @@ public: void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); SwView(SfxViewFrame* pFrame, SfxViewShell*); - virtual ~SwView(); + virtual ~SwView() override; void NotifyDBChanged(); diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 8223c0d29190..033bda7eea6e 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -549,7 +549,7 @@ public: SwViewShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr, OutputDevice *pOut = nullptr, long nFlags = 0 ); - virtual ~SwViewShell(); + virtual ~SwViewShell() override; sal_Int32 GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect& rRect ) const; diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 04ae4e55b9d6..e7714f027a90 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -131,7 +131,7 @@ public: const Point& rPtPos, SwPaM* pRing = nullptr ); // note: *intentionally* links the new shell cursor into the old one's Ring SwShellCursor( SwShellCursor& ); - virtual ~SwShellCursor(); + virtual ~SwShellCursor() override; virtual void FillRects() override; // For Table- und normal cursors. /// @see SwSelPaintRects::FillStartEnd(), override for text selections. @@ -182,7 +182,7 @@ public: SwShellTableCursor( const SwCursorShell& rCursorSh, const SwPosition &rMkPos, const Point& rMkPt, const SwPosition &rPtPos, const Point& rPtPt ); - virtual ~SwShellTableCursor(); + virtual ~SwShellTableCursor() override; virtual void FillRects() override; // For table and normal cursor. /// @see SwSelPaintRects::FillStartEnd(), override for table selections. diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index 3e0cf53aecea..da8f674db260 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -36,7 +36,7 @@ private: public: SwWebDocShell(); - virtual ~SwWebDocShell(); + virtual ~SwWebDocShell() override; virtual void FillClass( SvGlobalName * pClassName, SotClipboardFormatId * pClipFormat, |